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 added redirects and updated links into release/1.16.x #17767

Conversation

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

Backport

This PR is auto-generated from #17764 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: "15968d04d504a3813225e2db66a87deccdb0625a", automatic backport requires rebase workflow

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


Description

Replaces links to service-to-service-traffic-peers with links to establish-cluster-peering and adds a redirect.

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/redirect-mesh-gw-to-peering-usage/immensely-feasible-mullet branch from 5e336e4 to 6e82b04 Compare June 15, 2023 16:43
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/redirect-mesh-gw-to-peering-usage/immensely-feasible-mullet branch from 23de07a to 2658735 Compare June 15, 2023 16:43
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jun 15, 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

@trujillo-adam trujillo-adam marked this pull request as ready for review June 15, 2023 19:13
@trujillo-adam trujillo-adam requested a review from a team as a code owner June 15, 2023 19:13
@trujillo-adam trujillo-adam merged commit 15a10b4 into release/1.16.x Jun 15, 2023
@trujillo-adam trujillo-adam deleted the backport/docs/redirect-mesh-gw-to-peering-usage/immensely-feasible-mullet branch June 15, 2023 20:52
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