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 add docs for consul-k8s config read command into release/1.15.x #17473

Conversation

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

Backport

This PR is auto-generated from #17461 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: "4a22f34b599242962638bd0f85c054da6cdac30f", automatic backport requires rebase workflow

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


This PR adds documentation for the functionality introduced in hashicorp/consul-k8s#2078.

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/hans/add_k8s_config_read_docs/trivially-balanced-treefrog branch 2 times, most recently from b116618 to efc6b1d Compare May 25, 2023 17:10
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/hans/add_k8s_config_read_docs/trivially-balanced-treefrog branch from 8bf33b7 to 1ed6319 Compare May 25, 2023 17:10
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label May 25, 2023
Copy link

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 May 25, 2023 17:14 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 25, 2023 17:20 Inactive
@hanshasselberg hanshasselberg marked this pull request as ready for review May 25, 2023 20:54
@hanshasselberg hanshasselberg requested a review from a team as a code owner May 25, 2023 20:54
@hanshasselberg
Copy link
Member

This PR is fine as is -- only merge commits didn't make it in here.

@david-yu
Copy link
Contributor

@hanshasselberg I can merge for you when 1.1.2 is released.

@hanshasselberg
Copy link
Member

@david-yu sounds good, letting you merge this one. I will try to keep an eye out on the ent merge.

@david-yu david-yu merged commit d2a1795 into release/1.15.x Jun 5, 2023
@david-yu david-yu deleted the backport/hans/add_k8s_config_read_docs/trivially-balanced-treefrog branch June 5, 2023 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants