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
```

Kubernetes-commit: 70960a5ed785c64df837139a783f89901d7891f1
  • Loading branch information
k8s-publish-robot committed Oct 21, 2017
2 parents 6994313 + 24e4b2a commit 6a4fea7
Show file tree
Hide file tree
Showing 64 changed files with 3,528 additions and 2,259 deletions.
444 changes: 224 additions & 220 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

13 changes: 7 additions & 6 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: 1 addition & 0 deletions vendor/google.golang.org/grpc/AUTHORS

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

60 changes: 23 additions & 37 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: 202 additions & 28 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: 0 additions & 22 deletions vendor/google.golang.org/grpc/PATENTS

This file was deleted.

8 changes: 6 additions & 2 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 6a4fea7

Please sign in to comment.