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 docs: update CHANGELOG for K8s 1.4.0 release into release/1.4.x #3712

Conversation

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

Backport

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

  • Add CHANGELOG for 1.4.0 to main and release branch

How I've tested this PR

Visual inspection

How I expect reviewers to test this PR

👀


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 29, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/k8s-1.4.0-changelog-update/truly-working-boar branch from 159beb7 to c16ff42 Compare February 29, 2024 23:04
@zalimeni zalimeni marked this pull request as ready for review February 29, 2024 23:04
@zalimeni zalimeni enabled auto-merge (squash) February 29, 2024 23:04
@zalimeni zalimeni merged commit e7232e8 into release/1.4.x Feb 29, 2024
26 of 50 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/k8s-1.4.0-changelog-update/truly-working-boar branch February 29, 2024 23: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.

3 participants