Skip to content

Commit

Permalink
Merge pull request #51154 from RenaudWasTaken/gRPC-updated-1-3-0
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 51193, 51154, 42689, 51189, 51200)

Bumped gRPC version to 1.3.0

**What this PR does / why we need it**:

This PR bumps down the version of the vendored version of gRPC from v1.5.1 to v1.3.0
This is needed as part of the Device Plugin API where we expect client and server to use the Keep alive feature in order to detect an error.

Unfortunately I had to also bump the version of `golang.org/x/text` and `golang.org/x/net`.

- Design document: kubernetes/community#695
- PR tracking: [kubernetes/enhancements#368](kubernetes/enhancements#368 (comment))

**Which issue this PR fixes**: fixes #51099
Which was caused by my previous PR updating to 1.5.1

**Special notes for your reviewer**:
@vishh @jiayingz @shyamjvs

**Release note**:
```
Bumped gRPC to v1.3.0
```

Kubernetes-commit: 5fb38a325efb343c2a0467a12732829bd5ed3c3c
  • Loading branch information
k8s-publish-robot committed Aug 29, 2017
2 parents efa587c + 6027378 commit 84691fb
Show file tree
Hide file tree
Showing 73 changed files with 13,329 additions and 4,770 deletions.
38 changes: 21 additions & 17 deletions Godeps/Godeps.json

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

641 changes: 641 additions & 0 deletions vendor/golang.org/x/net/http2/ciphers.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/golang.org/x/net/http2/client_conn_pool.go

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

2 changes: 1 addition & 1 deletion vendor/golang.org/x/net/http2/configure_transport.go

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

146 changes: 146 additions & 0 deletions vendor/golang.org/x/net/http2/databuffer.go

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

13 changes: 8 additions & 5 deletions vendor/golang.org/x/net/http2/errors.go

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

60 changes: 0 additions & 60 deletions vendor/golang.org/x/net/http2/fixed_buffer.go

This file was deleted.

Loading

0 comments on commit 84691fb

Please sign in to comment.