From 804c2a905125ada0c64a347eab5d09d0ad31895e Mon Sep 17 00:00:00 2001
From: Jean de Klerk <deklerk@google.com>
Date: Thu, 26 Jul 2018 14:24:04 -0700
Subject: [PATCH] remove 1.6 support for channelz (#2242)

ChannelZ is a debugging feature in grpc. It has not had appengine support; this commit
removes its support for 1.6, too. This change is because in a recent sys/unix commit
1.6 support was broken.
---
 .travis.yml                                | 1 +
 channelz/service/func_linux.go             | 2 +-
 channelz/service/func_nonlinux.go          | 2 +-
 channelz/service/service_sktopt_test.go    | 2 +-
 channelz/service/util_sktopt_386_test.go   | 2 +-
 channelz/service/util_sktopt_amd64_test.go | 2 +-
 internal/channelz/types_linux.go           | 2 +-
 internal/channelz/types_nonlinux.go        | 2 +-
 internal/syscall/syscall_linux.go          | 2 +-
 internal/syscall/syscall_nonlinux.go       | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d0f757d7..5b5bfb13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ matrix:
   include:
   - go: 1.10.x
     env: VET=1 RACE=1
+  - go: 1.6.x
   - go: 1.7.x
   - go: 1.8.x
   - go: 1.9.x
diff --git a/channelz/service/func_linux.go b/channelz/service/func_linux.go
index 192c3a1f..fc5bbf36 100644
--- a/channelz/service/func_linux.go
+++ b/channelz/service/func_linux.go
@@ -1,4 +1,4 @@
-// +build !appengine
+// +build !appengine,go1.7
 
 /*
  *
diff --git a/channelz/service/func_nonlinux.go b/channelz/service/func_nonlinux.go
index eb53334e..44a9f195 100644
--- a/channelz/service/func_nonlinux.go
+++ b/channelz/service/func_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux appengine !go1.7
 
 /*
  *
diff --git a/channelz/service/service_sktopt_test.go b/channelz/service/service_sktopt_test.go
index 894f57d4..e7e1c7ea 100644
--- a/channelz/service/service_sktopt_test.go
+++ b/channelz/service/service_sktopt_test.go
@@ -1,4 +1,4 @@
-// +build linux,!appengine
+// +build linux,!appengine,go1.7
 // +build 386 amd64
 
 /*
diff --git a/channelz/service/util_sktopt_386_test.go b/channelz/service/util_sktopt_386_test.go
index cdc2fda4..e713f16d 100644
--- a/channelz/service/util_sktopt_386_test.go
+++ b/channelz/service/util_sktopt_386_test.go
@@ -1,4 +1,4 @@
-// +build 386,linux,!appengine
+// +build 386,linux,!appengine,go1.7
 
 /*
  *
diff --git a/channelz/service/util_sktopt_amd64_test.go b/channelz/service/util_sktopt_amd64_test.go
index 7ebe9c70..0c1db69b 100644
--- a/channelz/service/util_sktopt_amd64_test.go
+++ b/channelz/service/util_sktopt_amd64_test.go
@@ -1,4 +1,4 @@
-// +build amd64,linux,!appengine
+// +build amd64,linux,!appengine,go1.7
 
 /*
  *
diff --git a/internal/channelz/types_linux.go b/internal/channelz/types_linux.go
index 132b7702..9801c3e2 100644
--- a/internal/channelz/types_linux.go
+++ b/internal/channelz/types_linux.go
@@ -1,4 +1,4 @@
-// +build !appengine
+// +build !appengine,go1.7
 
 /*
  *
diff --git a/internal/channelz/types_nonlinux.go b/internal/channelz/types_nonlinux.go
index c4e7949c..884910c4 100644
--- a/internal/channelz/types_nonlinux.go
+++ b/internal/channelz/types_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux appengine !go1.7
 
 /*
  *
diff --git a/internal/syscall/syscall_linux.go b/internal/syscall/syscall_linux.go
index 1c7cef61..87bc65a1 100644
--- a/internal/syscall/syscall_linux.go
+++ b/internal/syscall/syscall_linux.go
@@ -1,4 +1,4 @@
-// +build !appengine
+// +build !appengine,go1.7
 
 /*
  *
diff --git a/internal/syscall/syscall_nonlinux.go b/internal/syscall/syscall_nonlinux.go
index 887c38bb..16a5c3fe 100644
--- a/internal/syscall/syscall_nonlinux.go
+++ b/internal/syscall/syscall_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux appengine !go1.7
 
 /*
  *