remove 1.6 support for channelz

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. See: golang/go#26576 (comment).
jeanbza · Jul 26, 2018 · 865e9e6 · 865e9e6
1 parent 339b6cb
commit 865e9e6
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -1,4 +1,4 @@
-// +build !appengine
+// +build !appengine,!go1.6
 
 /*
  *

diff --git a/channelz/service/func_nonlinux.go b/channelz/service/func_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux appengine go1.6
 
 /*
  *

diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-// +build !appengine
+// +build !appengine,!go1.6
 
 /*
  *

diff --git a/internal/channelz/types_nonlinux.go b/internal/channelz/types_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux appengine go1.6
 
 /*
  *

diff --git a/internal/syscall/syscall_linux.go b/internal/syscall/syscall_linux.go
@@ -1,4 +1,4 @@
-// +build !appengine
+// +build !appengine,!go1.6
 
 /*
  *

diff --git a/internal/syscall/syscall_nonlinux.go b/internal/syscall/syscall_nonlinux.go
@@ -1,4 +1,4 @@
-// +build !linux appengine
+// +build !linux appengine go1.6
 
 /*
  *