Merge pull request #9994 from gyuho/grpc

vendor: upgrade google.golang.org/grpc to v1.14.0
etcd-io · Aug 10, 2018 · 457a96d · 457a96d
2 parents 4fa58fc + 7e2e71c
commit 457a96d
Show file tree

Hide file tree

Showing 41 changed files with 1,944 additions and 1,196 deletions.
diff --git a/.words b/.words
@@ -102,3 +102,4 @@ BackoffFunc
 CallOptions
 
 __lostleader
+ErrConnClosing
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/clientv3/integration/server_shutdown_test.go b/clientv3/integration/server_shutdown_test.go
@@ -28,7 +28,6 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/transport"
 )
 
 // TestBalancerUnderServerShutdownWatch expects that watch client
@@ -394,7 +393,7 @@ func isClientTimeout(err error) bool {
 		return false
 	}
 	code := ev.Code()
-	return code == codes.DeadlineExceeded || ev.Message() == transport.ErrConnClosing.Desc
+	return code == codes.DeadlineExceeded
 }
 
 func isCanceled(err error) bool {

diff --git a/vendor/google.golang.org/grpc/balancer/balancer.go b/vendor/google.golang.org/grpc/balancer/balancer.go
diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go