Merge branch 'master' into ip-forwarding

- Merges aleksej-paschenko's with HEAD
- Adds vfs2 support for ip_forward

1 files changed, 26 insertions, 0 deletions

diff --git a/tools/go_generics/tests/consts/output.go b/tools/go_generics/tests/consts/output.go
new file mode 100644
index 000000000..18d316cc9
--- /dev/null
+++ b/tools/go_generics/tests/consts/output.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+const c1 = 20
+const x, y, z = 100, 200, 600
+const v float32 = 3.3
+const s = "def"
+const (
+	A              = 20
+	B, C, D        = 10, 100, 30
+	S              = "def"
+	T, U, V string = "ABC", "def", "ghi"
+)