Skip to content

Backport of GH-3406 - Only error for config entries from different datacenters when the config entries are different into release/1.3.x#3931

Merged
jmurret merged 1 commit intorelease/1.3.xfrom
backport/jm/gh-3406/uniquely-suitable-coyote
Apr 20, 2024
Merged

Backport of GH-3406 - Only error for config entries from different datacenters when the config entries are different into release/1.3.x#3931
jmurret merged 1 commit intorelease/1.3.xfrom
backport/jm/gh-3406/uniquely-suitable-coyote

Conversation

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

Backport

This PR is auto-generated from #3873 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:
@jmurret
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.


Fixes #3406

Changes proposed in this PR

How I've tested this PR

How I expect reviewers to test this PR

Checklist


Overview of commits

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app bot commented Apr 19, 2024

CLA assistant check
All committers have signed the CLA.

@jmurret jmurret marked this pull request as ready for review April 19, 2024 23:54
@jmurret jmurret enabled auto-merge (squash) April 19, 2024 23:55
@jmurret jmurret force-pushed the backport/jm/gh-3406/uniquely-suitable-coyote branch from a5983ad to d051cfb Compare April 19, 2024 23:58
@jmurret jmurret merged commit f702da0 into release/1.3.x Apr 20, 2024
@jmurret jmurret deleted the backport/jm/gh-3406/uniquely-suitable-coyote branch April 20, 2024 00:26
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.

2 participants