Skip to content

Backport #25647 and #25510#25664

Merged
gnossen merged 3 commits intogrpc:v1.36.xfrom
gnossen:backport_25647
Mar 10, 2021
Merged

Backport #25647 and #25510#25664
gnossen merged 3 commits intogrpc:v1.36.xfrom
gnossen:backport_25647

Conversation

@gnossen
Copy link
Copy Markdown
Contributor

@gnossen gnossen commented Mar 9, 2021

As requested here.

Turns out I needed both PRs in order to build all of the images.

Copy link
Copy Markdown
Contributor

@lidizheng lidizheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this!

@lidizheng
Copy link
Copy Markdown
Contributor

It seems some Docker images need to be re-generated.

Copy link
Copy Markdown
Contributor

@jtattermusch jtattermusch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@lidizheng
Copy link
Copy Markdown
Contributor

Known failures: #25675 #25660 #19834

@gnossen gnossen merged commit 3956ebe into grpc:v1.36.x Mar 10, 2021
@gnossen gnossen deleted the backport_25647 branch March 10, 2021 19:04
gnossen added a commit that referenced this pull request Mar 24, 2021
* 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 <[email protected]>

* [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 <[email protected]>
Co-authored-by: Levon Ter-Grigoryan <[email protected]>

* 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 <[email protected]>

* Fix an infinite read loop with SRV record resolution on windows (#25690)

* Bump version to 1.36.4 (#25744)

Co-authored-by: Lidi Zheng <[email protected]>
Co-authored-by: Jan Tattermusch <[email protected]>
Co-authored-by: Jan Tattermusch <[email protected]>
Co-authored-by: Mark D. Roth <[email protected]>
Co-authored-by: apolcyn <[email protected]>
Co-authored-by: Levon Ter-Grigoryan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/test lang/all wrapped languages 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.

3 participants