Skip to content

Backport of Change URLs for redirects from RC to default latest into release/1.16.x#17825

Merged
trujillo-adam merged 2 commits intorelease/1.16.xfrom
backport/docs/temp-to-perm-redirects-1.16-ga/generally-cheerful-weevil
Jun 21, 2023
Merged

Backport of Change URLs for redirects from RC to default latest into release/1.16.x#17825
trujillo-adam merged 2 commits intorelease/1.16.xfrom
backport/docs/temp-to-perm-redirects-1.16-ga/generally-cheerful-weevil

Conversation

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

Backport

This PR is auto-generated from #17822 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:
@trujillo-adam
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: "3b980402630ac01755ad99c2b5e4f00da682b804", automatic backport requires rebase workflow

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


Description

This PR updates the redirects implemented for the 1.16-RC version of the docs so that they use the latest paths.

PR Checklist

  • 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/temp-to-perm-redirects-1.16-ga/generally-cheerful-weevil branch from b9e0dc2 to 1572fd7 Compare June 20, 2023 20:18
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/temp-to-perm-redirects-1.16-ga/generally-cheerful-weevil branch from b096896 to d96c462 Compare June 20, 2023 20:18
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jun 20, 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

@trujillo-adam trujillo-adam marked this pull request as ready for review June 21, 2023 16:09
@trujillo-adam trujillo-adam merged commit 48200d1 into release/1.16.x Jun 21, 2023
@trujillo-adam trujillo-adam deleted the backport/docs/temp-to-perm-redirects-1.16-ga/generally-cheerful-weevil branch June 21, 2023 16:31
@trujillo-adam trujillo-adam restored the backport/docs/temp-to-perm-redirects-1.16-ga/generally-cheerful-weevil branch June 26, 2023 17:00
@trujillo-adam trujillo-adam deleted the backport/docs/temp-to-perm-redirects-1.16-ga/generally-cheerful-weevil branch July 24, 2023 14:20
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