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 test: fix TestConnectInject_ProxyLifecycleShutdown into release/1.3.x #3797

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@DanStough
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

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

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


Changes proposed in this PR

How I've tested this PR

  • CI/CD

How I expect reviewers to test this PR

👁️ 🔍

Checklist


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Mar 20, 2024

CLA assistant check
All committers have signed the CLA.

@DanStough DanStough force-pushed the backport/dans/NET-8345/graceful-shutdown-test-fix/horribly-humble-kingfish branch from 8278681 to 77c713d Compare March 20, 2024 15:41
@DanStough DanStough marked this pull request as ready for review March 20, 2024 15:41
Copy link
Contributor

@DanStough DanStough left a comment

Choose a reason for hiding this comment

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

Content unchanged from the original PR.

@DanStough DanStough merged commit b688c4e into release/1.3.x Mar 20, 2024
50 checks passed
@DanStough DanStough deleted the backport/dans/NET-8345/graceful-shutdown-test-fix/horribly-humble-kingfish branch March 20, 2024 17:50
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.

3 participants