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 K8s changelog to address cloud auto-join change in 1.0.0 into release/1.14.x #18296

Conversation

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

Backport

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

🚨

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:
@pglass
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.


Description

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/NET-4881/k8s-cloud-auto-join-1.0-release-note/violently-subtle-emu branch from aebc520 to 2f042af Compare July 26, 2023 20:25
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/NET-4881/k8s-cloud-auto-join-1.0-release-note/violently-subtle-emu branch from 2f042af to aebc520 Compare July 26, 2023 20:25
@hashicorp-cla
Copy link

hashicorp-cla commented Jul 26, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 26, 2023 20:29 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 26, 2023 20:31 Inactive
@pglass pglass force-pushed the backport/docs/NET-4881/k8s-cloud-auto-join-1.0-release-note/violently-subtle-emu branch from db02354 to 4fd3ac5 Compare July 26, 2023 20:36
@pglass pglass marked this pull request as ready for review July 26, 2023 20:36
@pglass pglass requested a review from a team as a code owner July 26, 2023 20:37
@pglass pglass enabled auto-merge (squash) July 26, 2023 20:37
@pglass pglass merged commit e50bc91 into release/1.14.x Jul 26, 2023
@pglass pglass deleted the backport/docs/NET-4881/k8s-cloud-auto-join-1.0-release-note/violently-subtle-emu branch July 26, 2023 21:11
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.

4 participants