Skip to content

Merge changes from v1.35.x branch into master#25183

Merged
jtattermusch merged 21 commits intogrpc:masterfrom
jtattermusch:upport_v1_35_x
Jan 19, 2021
Merged

Merge changes from v1.35.x branch into master#25183
jtattermusch merged 21 commits intogrpc:masterfrom
jtattermusch:upport_v1_35_x

Conversation

@jtattermusch
Copy link
Copy Markdown
Contributor

Among other changes, this also upports upgrading third_party/protobuf to 3.14.0: #25131

stanley-cheung and others added 21 commits January 6, 2021 19:39
…_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
Copy link
Copy Markdown
Contributor Author

Known failures: grpc/grpc-java#7820

@jtattermusch jtattermusch merged commit 1e31d66 into grpc:master Jan 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release notes: no Indicates if PR should not be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants