Skip to content

Commit 70960a5

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#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 kubernetes#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 ```
2 parents ba66fcb + 99e9ec1 commit 70960a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+6243
-2444
lines changed

Godeps/Godeps.json

+33-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/LICENSES

+3,049-403
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json

+18-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiserver/Godeps/Godeps.json

+19-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json

+19-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)