Skip to content

Commit

Permalink
Merge pull request kubernetes#54400 from kubernetes/revert-53128-gode…
Browse files Browse the repository at this point in the history
…ps_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>.

Revert "update gRPC to pick up data race fix"

Reverts kubernetes#53128

Fixes kubernetes#51099

cc @kubernetes/sig-api-machinery-bugs @wojtek-t @dixudx
  • Loading branch information
Kubernetes Submit Queue committed Oct 23, 2017
2 parents 3ae0b84 + d515f0e commit bc69c92
Show file tree
Hide file tree
Showing 60 changed files with 2,437 additions and 6,236 deletions.
61 changes: 28 additions & 33 deletions Godeps/Godeps.json

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

3,438 changes: 396 additions & 3,042 deletions Godeps/LICENSES

Large diffs are not rendered by default.

32 changes: 14 additions & 18 deletions staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json

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

33 changes: 14 additions & 19 deletions staging/src/k8s.io/apiserver/Godeps/Godeps.json

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

33 changes: 14 additions & 19 deletions staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json

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

Loading

0 comments on commit bc69c92

Please sign in to comment.