Skip to content

Backport of Propose new changes to APIgw upgrade instructions into release/1.16.x#17909

Merged
im2nguyen merged 3 commits into
release/1.16.xfrom
backport/docs/update-apigw-upgrade-instructions/initially-magnetic-colt
Jun 30, 2023
Merged

Backport of Propose new changes to APIgw upgrade instructions into release/1.16.x#17909
im2nguyen merged 3 commits into
release/1.16.xfrom
backport/docs/update-apigw-upgrade-instructions/initially-magnetic-colt

Conversation

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

Backport

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

🚨

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:
@im2nguyen
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

Testing & Reproduction steps

Links

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/update-apigw-upgrade-instructions/initially-magnetic-colt branch from 0e8b186 to f1abb4b Compare June 27, 2023 19:36
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/update-apigw-upgrade-instructions/initially-magnetic-colt branch from f1abb4b to 0e8b186 Compare June 27, 2023 19:36
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Jun 27, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • im2nguyen
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

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

@david-yu
Copy link
Copy Markdown
Contributor

@im2nguyen this looks like a failed backport

@im2nguyen im2nguyen marked this pull request as ready for review June 30, 2023 04:25
@im2nguyen im2nguyen requested a review from a team as a code owner June 30, 2023 04:25
@im2nguyen im2nguyen enabled auto-merge (squash) June 30, 2023 04:26
@im2nguyen im2nguyen disabled auto-merge June 30, 2023 04:44
@im2nguyen im2nguyen merged commit 04e31cc into release/1.16.x Jun 30, 2023
@im2nguyen im2nguyen deleted the backport/docs/update-apigw-upgrade-instructions/initially-magnetic-colt branch June 30, 2023 04:44
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.

5 participants