Skip to content

Backport of removed deprecated patchesStrategicMerge into release/1.0.x#2895

Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.0.xfrom
backport/mw/update-deprecated-kustomize-fixtures/properly-ultimate-sunbeam
Closed

Backport of removed deprecated patchesStrategicMerge into release/1.0.x#2895
hc-github-team-consul-core wants to merge 1 commit intorelease/1.0.xfrom
backport/mw/update-deprecated-kustomize-fixtures/properly-ultimate-sunbeam

Conversation

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

Backport

This PR is auto-generated from #2894 to be assessed for backporting due to the inclusion of the label backport/1.0.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:
@wilkermichael
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:

@t-eckert Thanks for the script :)
How I've tested this PR:

How I expect reviewers to test this PR:

Checklist:


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/mw/update-deprecated-kustomize-fixtures/properly-ultimate-sunbeam branch from 80f3803 to a9ffc1d Compare September 5, 2023 15:07
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Sep 5, 2023

CLA assistant check
All committers have signed the CLA.

@wilkermichael wilkermichael force-pushed the backport/mw/update-deprecated-kustomize-fixtures/properly-ultimate-sunbeam branch from e74866d to 88eae1d Compare September 7, 2023 17:17
@wilkermichael wilkermichael deleted the backport/mw/update-deprecated-kustomize-fixtures/properly-ultimate-sunbeam branch December 18, 2023 16:36
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