Skip to content

Commit

Permalink
Merge pull request #17735 from mfojtik/grpc-picks-37
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

UPSTREAM: google.golang.org/grpc: 1005: fix logical race in flow control
  • Loading branch information
openshift-merge-robot authored Jan 24, 2018
2 parents 6aeba0c + 1b84e0b commit f04c04e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 42 deletions.
34 changes: 6 additions & 28 deletions vendor/google.golang.org/grpc/transport/control.go

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

11 changes: 3 additions & 8 deletions vendor/google.golang.org/grpc/transport/http2_client.go

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

7 changes: 1 addition & 6 deletions vendor/google.golang.org/grpc/transport/http2_server.go

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

0 comments on commit f04c04e

Please sign in to comment.