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.

Sign up for GitHub

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

Jump to bottom

Backport of Update consul-k8s install command so it is valid into release/1.15.x #17314

Merged
merged 1 commit into from
May 15, 2023
Merged

Backport of Update consul-k8s install command so it is valid into release/1.15.x #17314

merged 1 commit into from
May 15, 2023

Conversation

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

Backport

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

🚨

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: unable to process merge commit: "04a65130f4f3d0370b49e256a151652213af4f32", automatic backport requires rebase workflow

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-install-consul-k8s/hugely-giving-jackass branch from 48a620c to 1711c8d Compare May 11, 2023 18:55
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/update-install-consul-k8s/hugely-giving-jackass branch from 00c0858 to 73b8120 Compare May 11, 2023 18:55
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label May 11, 2023
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes May 11, 2023
View reviewed changes
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

@im2nguyen im2nguyen marked this pull request as ready for review May 11, 2023 18:58
@im2nguyen im2nguyen requested a review from a team as a code owner May 11, 2023 18:58
@im2nguyen im2nguyen enabled auto-merge (squash) May 11, 2023 19:02
@im2nguyen im2nguyen merged commit 50a7a07 into release/1.15.x May 15, 2023
@im2nguyen im2nguyen deleted the backport/docs/update-install-consul-k8s/hugely-giving-jackass branch May 15, 2023 21:56
@jjti jjti mentioned this pull request Aug 28, 2023
Closed
@dlaguerta dlaguerta mentioned this pull request Dec 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@im2nguyen im2nguyen im2nguyen approved these changes

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

Assignees
No one assigned
Labels
type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-consul-core @im2nguyen @github-team-consul-core-pr-approver