Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Allow overriding gRPC's connection timeout with VAULT_GRPC_MIN_CONNECT_TIMEOUT into release/1.11.x #19678

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #19676 to be assessed for backporting due to the inclusion of the label backport/1.11.x.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Original PR had no description content.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/add-grpc-min-connect-timeout-override/mostly-sweet-slug branch from 87b77ff to 813c80f Compare March 22, 2023 18:51
@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/add-grpc-min-connect-timeout-override/mostly-sweet-slug branch from 813c80f to 87b77ff Compare March 22, 2023 18:51
@hashicorp-cla
Copy link

hashicorp-cla commented Mar 22, 2023

CLA assistant check
All committers have signed the CLA.

@ncabatoff ncabatoff force-pushed the backport/add-grpc-min-connect-timeout-override/mostly-sweet-slug branch from 32f8981 to 094fae1 Compare March 22, 2023 19:46
@ncabatoff ncabatoff marked this pull request as ready for review March 22, 2023 19:46
@ncabatoff ncabatoff added this to the 1.11.9 milestone Mar 22, 2023
@ncabatoff ncabatoff enabled auto-merge (squash) March 22, 2023 20:11
@ncabatoff ncabatoff disabled auto-merge March 22, 2023 22:19
@ncabatoff ncabatoff enabled auto-merge (squash) March 23, 2023 14:35
@ncabatoff ncabatoff disabled auto-merge March 23, 2023 14:48
@ncabatoff ncabatoff merged commit 947beba into release/1.11.x Mar 23, 2023
@ncabatoff ncabatoff deleted the backport/add-grpc-min-connect-timeout-override/mostly-sweet-slug branch March 23, 2023 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants