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-1825: More new ACL token creation docs into release/1.15.x #18256

Conversation

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

Backport

This PR is auto-generated from #18063 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:
@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: unable to process merge commit: "b2ae7caccb58cc9b499e061ceedd47e9bf64bd69", automatic backport requires rebase workflow

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


Description

This adds more ACL token creation documentation pages for additional use cases

(Follow on from #16465)

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-1825/acl-token-docs-2/remotely-composed-bluebird branch from fcecc5c to 320203d Compare July 24, 2023 16:53
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/NET-1825/acl-token-docs-2/remotely-composed-bluebird branch 2 times, most recently from 51be8a8 to c9ee36c Compare July 24, 2023 16:53
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jul 24, 2023
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

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

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 24, 2023 16:56 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 24, 2023 17:04 Inactive
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
@pglass pglass force-pushed the backport/docs/NET-1825/acl-token-docs-2/remotely-composed-bluebird branch from c9ee36c to ecdf0dd Compare July 24, 2023 18:22
@pglass pglass marked this pull request as ready for review July 24, 2023 18:32
@pglass pglass requested a review from a team as a code owner July 24, 2023 18:32
@pglass pglass enabled auto-merge (squash) July 24, 2023 18:38
@pglass pglass merged commit 3425e65 into release/1.15.x Jul 24, 2023
@pglass pglass deleted the backport/docs/NET-1825/acl-token-docs-2/remotely-composed-bluebird branch July 24, 2023 18:41
@jira jira bot mentioned this pull request Aug 28, 2023
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.

3 participants