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 NET 6409 into release/1.15.x #19985

Merged

Conversation

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

Backport

This PR is auto-generated from #19515 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:
@david-yu
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: "d62a35f7e37d76e8db2d58e8e14d86fb6dce9e58", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Added docs for Consul K8s Proxy Stats Command

Testing & Reproduction steps

Links

PR Checklist

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

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Dec 18, 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

* Update website/content/docs/k8s/k8s-cli.mdx

Co-authored-by: David Yu <[email protected]>

* Update website/content/docs/k8s/k8s-cli.mdx

Co-authored-by: David Yu <[email protected]>

* fix doc

* Update website/content/docs/k8s/k8s-cli.mdx

Co-authored-by: David Yu <[email protected]>

---------

Co-authored-by: David Yu <[email protected]>
@absolutelightning absolutelightning force-pushed the backport/NET-6409/allegedly-live-glowworm branch from e1444ec to 0a73c7a Compare December 19, 2023 07:07
@absolutelightning absolutelightning marked this pull request as ready for review December 19, 2023 07:07
@absolutelightning absolutelightning requested a review from a team as a code owner December 19, 2023 07:07
@absolutelightning absolutelightning enabled auto-merge (squash) December 19, 2023 07:08
@absolutelightning absolutelightning merged commit ed0e613 into release/1.15.x Dec 19, 2023
46 of 48 checks passed
@absolutelightning absolutelightning deleted the backport/NET-6409/allegedly-live-glowworm branch December 19, 2023 07:18
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