Skip to content

add env var protection for google-c2p resolver#25548

Merged
markdroth merged 1 commit intogrpc:masterfrom
markdroth:c2p_resolver_env_var_guard
Feb 24, 2021
Merged

add env var protection for google-c2p resolver#25548
markdroth merged 1 commit intogrpc:masterfrom
markdroth:c2p_resolver_env_var_guard

Conversation

@markdroth
Copy link
Copy Markdown
Member

No description provided.

@markdroth markdroth added the release notes: no Indicates if PR should not be in release notes label Feb 24, 2021
@markdroth markdroth requested a review from apolcyn February 24, 2021 18:59
@markdroth markdroth merged commit 28a253f into grpc:master Feb 24, 2021
@markdroth markdroth deleted the c2p_resolver_env_var_guard branch February 24, 2021 23:40
@lidizheng
Copy link
Copy Markdown
Contributor

@markdroth Can you create a backport PR to v1.36.x?

@markdroth
Copy link
Copy Markdown
Member Author

Created a back-port in #25569.

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

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