Skip to content

Commit

Permalink
Merge pull request #53128 from dixudx/godeps_fix_grpc_data_race
Browse files Browse the repository at this point in the history
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 
```
  • Loading branch information
Kubernetes Submit Queue committed Oct 20, 2017
2 parents ba66fcb + 99e9ec1 commit 70960a5
Show file tree
Hide file tree
Showing 60 changed files with 6,243 additions and 2,444 deletions.
61 changes: 33 additions & 28 deletions Godeps/Godeps.json

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

3,452 changes: 3,049 additions & 403 deletions Godeps/LICENSES

Large diffs are not rendered by default.

32 changes: 18 additions & 14 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: 19 additions & 14 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: 19 additions & 14 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 70960a5

Please sign in to comment.