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 adding redirects for tproxy and envoy extensions into release/1.16.x #17690

Conversation

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

Backport

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

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


Description

Testing & Reproduction steps

Links

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/redirects-1.16-tproxy-envoy-ext/rightly-moral-pigeon branch from 9b35e53 to a9af26a Compare June 13, 2023 03:12
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/redirects-1.16-tproxy-envoy-ext/rightly-moral-pigeon branch from 2acceda to 3551fa4 Compare June 13, 2023 03:12
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 Jun 13, 2023
@trujillo-adam trujillo-adam marked this pull request as ready for review June 13, 2023 03:24
@trujillo-adam trujillo-adam enabled auto-merge (squash) June 13, 2023 03:24
@trujillo-adam trujillo-adam merged commit 4612b4d into release/1.16.x Jun 13, 2023
@trujillo-adam trujillo-adam deleted the backport/docs/redirects-1.16-tproxy-envoy-ext/rightly-moral-pigeon branch June 13, 2023 03:29
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