Skip to content

Backport of Fix ent bug caused by #17241. into release/1.13.x#17280

Closed
hc-github-team-consul-core wants to merge 1 commit into
release/1.13.xfrom
backport/derekm/NET-3881/health-call-loop-entfix/possibly-safe-swan
Closed

Backport of Fix ent bug caused by #17241. into release/1.13.x#17280
hc-github-team-consul-core wants to merge 1 commit into
release/1.13.xfrom
backport/derekm/NET-3881/health-call-loop-entfix/possibly-safe-swan

Conversation

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

Backport

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

🚨

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:
@hashi-derek
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/merges: 409 Merge conflict []

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


All tests passed in OSS, but not ENT on #17241. This is a patch to resolve the problem for both.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/derekm/NET-3881/health-call-loop-entfix/possibly-safe-swan branch from 02f0412 to aaf52ba Compare May 9, 2023 21:37
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented May 9, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@hashi-derek
Copy link
Copy Markdown
Contributor

Closing due to failed cherry-pick. Will address with a manual PR.

@hashi-derek hashi-derek closed this May 9, 2023
@nathancoleman
Copy link
Copy Markdown
Member

Addressed by #17284

@github-actions github-actions Bot deleted the backport/derekm/NET-3881/health-call-loop-entfix/possibly-safe-swan branch August 29, 2025 06:10
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.

5 participants