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 Update test to match PreparedQuery SamenessGroup bugfix. into release/1.2.x #3392

Merged

Conversation

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

Backport

This PR is auto-generated from #3387 to be assessed for backporting due to the inclusion of the label backport/1.2.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:
@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-k8s/merges: 409 Merge conflict []

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


Update test to assert the fixed behavior of PR #7773 in Consul Enterprise.

hashicorp/consul#19970


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Dec 18, 2023

CLA assistant check
All committers have signed the CLA.

Update test to assert the fixed behavior of PR #7773 in Consul Enterprise.
@hashi-derek hashi-derek force-pushed the backport/derekm/fix-pq-sg/roughly-darling-lamb branch from dd7d2e7 to fb91605 Compare December 18, 2023 19:17
@hashi-derek hashi-derek marked this pull request as ready for review December 19, 2023 14:06
@hashi-derek hashi-derek merged commit 5e40492 into release/1.2.x Dec 19, 2023
3 checks passed
@hashi-derek hashi-derek deleted the backport/derekm/fix-pq-sg/roughly-darling-lamb branch December 19, 2023 20:05
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