Skip to content

Commit

Permalink
Merge pull request #54400 from kubernetes/revert-53128-godeps_fix_grp…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
k8s-publish-robot committed Oct 24, 2017
2 parents cd859a4 + fdddf07 commit 3a771da
Show file tree
Hide file tree
Showing 51 changed files with 2,045 additions and 3,144 deletions.
182 changes: 89 additions & 93 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions vendor/google.golang.org/grpc/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/google.golang.org/grpc/AUTHORS

This file was deleted.

60 changes: 37 additions & 23 deletions vendor/google.golang.org/grpc/CONTRIBUTING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

230 changes: 28 additions & 202 deletions vendor/google.golang.org/grpc/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/google.golang.org/grpc/PATENTS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions vendor/google.golang.org/grpc/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3a771da

Please sign in to comment.