Merge pull request #54400 from kubernetes/revert-53128-godeps_fix_grp…

…c_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>. Revert "update gRPC to pick up data race fix" Reverts kubernetes/kubernetes#53128 Fixes kubernetes/kubernetes#51099 cc @kubernetes/sig-api-machinery-bugs @wojtek-t @dixudx Kubernetes-commit: bc69c92de15c2457b3566bbede5b363328e0d640
sttts · Oct 24, 2017 · 4fdc5f9 · 4fdc5f9
2 parents 177c2ea + c46932d
commit 4fdc5f9
Show file tree

Hide file tree

Showing 51 changed files with 1,970 additions and 3,069 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