Merge changes from v1.35.x branch into master #25183
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bump version to v1.35.0-pre1
…_declaration Backport "Fix implicit declaration error in zlib + macOS grpc#24979"
Python Circuit Breaking Interop Test Client Additions
[Backport] Python Circuit Breaking Interop Test Client Additions
…_for_1_35 Upgrade third_party/protobuf to v3.14.0 (for v1.35.x)
jtattermusch
added
the
release notes: no
jtattermusch
requested review from
gnossen,
nicolasnoble and
veblush
as code owners
|
Known failures: grpc/grpc-java#7820 |
stanley-cheung
approved these changes
Jan 19, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Among other changes, this also upports upgrading third_party/protobuf to 3.14.0: #25131