Skip to content

Backport of docs: JWT auth docs display fixes into release/1.16.x#17779

Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.16.xfrom
backport/docs/jwt-auth-fixes/poorly-suited-pelican
Closed

Backport of docs: JWT auth docs display fixes into release/1.16.x#17779
hc-github-team-consul-core wants to merge 1 commit intorelease/1.16.xfrom
backport/docs/jwt-auth-fixes/poorly-suited-pelican

Conversation

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

Backport

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

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


Description

An error in merging and backporting for the v1.16 release caused part of the JWT Auth docs to be merged into main but not into the release/1.16.x branch. As a result, the page is not displaying properly in the live docs.

This PR re-applies those commits to merge into the 1.16 release branch.

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/jwt-auth-fixes/poorly-suited-pelican branch from 9dab351 to 3c489ad Compare June 15, 2023 18:25
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/jwt-auth-fixes/poorly-suited-pelican branch from d0607f3 to 6831a51 Compare June 15, 2023 18:25
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

@jmurret
Copy link
Member

jmurret commented Jun 22, 2023

@jmurret jmurret closed this Jun 22, 2023
@github-actions github-actions bot deleted the backport/docs/jwt-auth-fixes/poorly-suited-pelican branch August 29, 2025 06:13
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.

4 participants