Merge pull request #53128 from dixudx/godeps_fix_grpc_data_race

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. update gRPC to pick up data race fix **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #53124 **Special notes for your reviewer**: **Release note**: ```release-note update gRPC to v1.6.0 to pick up data race fix grpc/grpc-go#1316 ``` Kubernetes-commit: 70960a5ed785c64df837139a783f89901d7891f1
sttts · Oct 26, 2017 · 38ff7e4 · 38ff7e4
2 parents fbfe66b + 9dcd133
commit 38ff7e4
Show file tree

Hide file tree

Showing 51 changed files with 4,691 additions and 3,644 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/vendor/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml
diff --git a/vendor/google.golang.org/grpc/AUTHORS b/vendor/google.golang.org/grpc/AUTHORS
diff --git a/vendor/google.golang.org/grpc/CONTRIBUTING.md b/vendor/google.golang.org/grpc/CONTRIBUTING.md
diff --git a/vendor/google.golang.org/grpc/LICENSE b/vendor/google.golang.org/grpc/LICENSE
diff --git a/vendor/google.golang.org/grpc/PATENTS b/vendor/google.golang.org/grpc/PATENTS
diff --git a/vendor/google.golang.org/grpc/README.md b/vendor/google.golang.org/grpc/README.md