mirror of https://github.com/grpc/grpc.git
Upmerge v1.36 to master (#25800)
* Bump version to 1.36.0-pre1 * Regenerate projects * update dotnet sdk5 docker image to avoid nuget download error * Merge pull request #25456 from gnossen/fix_interop_breakage Bump xDS Interop Tests to Python 3 * Backport #25490 into v1.36.x (#25506) * add IsNet5OrHigher to PlatformApis * use explicit native library loading whenever possible * Bump version to v1.36.0 (#25534) * add env var protection for google-c2p resolver (#25548) (#25569) * Bump version to 1.36.1 (#25574) * Relax ruby test check on protobuf error message (#25507) (#25591) Co-authored-by: apolcyn <apolcyn@google.com> * [Backport] Update the way dockerfiles install pip for python 2.7 and 3.5 (#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 <jtattermusch@google.com> Co-authored-by: Levon Ter-Grigoryan <patrios@google.com> * Backport #25647 and #25510 (#25664) * Fix pypa link (#25647) * Fix pypa link * And 3.5 as well * [xDS Proto] Pin PyPI dependencies in Dockerfiles (#25510) * Regenerate projects Co-authored-by: Lidi Zheng <lidiz@google.com> * Fix an infinite read loop with SRV record resolution on windows (#25690) * Bump version to 1.36.4 (#25744) Co-authored-by: Lidi Zheng <lidiz@google.com> Co-authored-by: Jan Tattermusch <jtattermusch@google.com> Co-authored-by: Jan Tattermusch <jtattermusch@users.noreply.github.com> Co-authored-by: Mark D. Roth <roth@google.com> Co-authored-by: apolcyn <apolcyn@google.com> Co-authored-by: Levon Ter-Grigoryan <patrios@google.com>pull/25798/head^2
Richard Belleville
4 years ago
committed by
GitHub
parent
3652ec5db9
commit
8c7c23dfca