Skip to content

Commit

Permalink
Merge pull request kubernetes#7 from feiskyer/cherry-pick-grpc
Browse files Browse the repository at this point in the history
Cherry pick grpc
  • Loading branch information
feiskyer committed Apr 4, 2016
2 parents 277b9ae + dbe37ff commit 17aea36
Show file tree
Hide file tree
Showing 110 changed files with 24,947 additions and 2,011 deletions.
6 changes: 3 additions & 3 deletions Godeps/Godeps.json

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

15 changes: 11 additions & 4 deletions Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile

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

2 changes: 1 addition & 1 deletion Godeps/_workspace/src/golang.org/x/net/http2/README

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

76 changes: 0 additions & 76 deletions Godeps/_workspace/src/golang.org/x/net/http2/buffer.go

This file was deleted.

225 changes: 225 additions & 0 deletions Godeps/_workspace/src/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.

Loading

0 comments on commit 17aea36

Please sign in to comment.