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 Fix some inconsistencies in jwt docs into release/1.16.x #18254

Merged

Conversation

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

Backport

This PR is auto-generated from #18234 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:
@jm96441n
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: "fc5b42b548a4528c214a7bfc60938e65992f3c29", automatic backport requires rebase workflow

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


Description

Fixing some inconsistencies in the JWT docs that I found while setting up a k8s cluster.

Testing & Reproduction steps

N/A

Links

N/A

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/fix-typo-in-jwt-docs/similarly-prompt-ferret branch from 583a3c1 to 3e77540 Compare July 24, 2023 16:36
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-typo-in-jwt-docs/similarly-prompt-ferret branch from de1057e to 74fadb0 Compare July 24, 2023 16:36
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

@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jul 24, 2023
@jm96441n jm96441n marked this pull request as ready for review July 24, 2023 16:55
@jm96441n jm96441n requested a review from a team as a code owner July 24, 2023 16:55
@david-yu david-yu merged commit 1650d2d into release/1.16.x Jul 24, 2023
@david-yu david-yu deleted the backport/fix-typo-in-jwt-docs/similarly-prompt-ferret branch July 24, 2023 18:22
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