Skip to content

Upmerge v1.36 to master#25800

Merged
gnossen merged 17 commits intogrpc:masterfrom
gnossen:upmerge_v1_36
Mar 24, 2021
Merged

Upmerge v1.36 to master#25800
gnossen merged 17 commits intogrpc:masterfrom
gnossen:upmerge_v1_36

Conversation

@gnossen
Copy link
Copy Markdown
Contributor

@gnossen gnossen commented Mar 24, 2021

Hopefully the contents are of this PR are pretty uncontroversial.

lidizheng and others added 17 commits February 9, 2021 11:48
Bump v1.36.x branch's version to 1.36.0-pre1
[Backport] Bump xDS Interop Tests to Python 3
* add IsNet5OrHigher to PlatformApis

* use explicit native library loading whenever possible
…3.5 (grpc#25607)

* Backport: Update the way dockerfiles install pip for python 2.7 and 3.5

* Fix implicit-int-float-conversion warning.

Co-authored-by: Jan Tattermusch <[email protected]>
Co-authored-by: Levon Ter-Grigoryan <[email protected]>
* Fix pypa link (grpc#25647)

* Fix pypa link

* And 3.5 as well

* [xDS Proto] Pin PyPI dependencies in Dockerfiles (grpc#25510)

* Regenerate projects

Co-authored-by: Lidi Zheng <[email protected]>
@gnossen gnossen added release notes: no Indicates if PR should not be in release notes lang/all labels Mar 24, 2021
@gnossen gnossen requested a review from lidizheng March 24, 2021 01:18
@gnossen gnossen enabled auto-merge (squash) March 24, 2021 01:29
@gnossen gnossen merged commit 8c7c23d into grpc:master Mar 24, 2021
@gnossen gnossen deleted the upmerge_v1_36 branch March 24, 2021 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lang/all 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