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 [NET-4904] Update list of Envoy versions in docs into release/1.15.x #18310

Conversation

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

Backport

This PR is auto-generated from #18306 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

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:
@zalimeni
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: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


Update supported Envoy versions across Consul release versions.

Note: it looks like these have fallen a bit out of date, so I'm expecting this to bring things up to speed in main and release/* branches.

Once we release 1.17, this will need to be updated again.

PRs to bump versions:

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/zalimeni/net-4904-bump-envoy-versions-docs/sharply-super-orca branch 2 times, most recently from b2696a3 to a573475 Compare July 27, 2023 15:52
@hashicorp-cla
Copy link

hashicorp-cla commented Jul 27, 2023

CLA assistant check
All committers have signed the CLA.

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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 27, 2023 15:55 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 27, 2023 15:58 Inactive
Update supported Envoy versions across Consul release versions.
@zalimeni zalimeni force-pushed the backport/zalimeni/net-4904-bump-envoy-versions-docs/sharply-super-orca branch from 2701e72 to 15815b4 Compare July 27, 2023 16:04
@zalimeni zalimeni marked this pull request as ready for review July 27, 2023 16:05
@zalimeni zalimeni requested a review from a team as a code owner July 27, 2023 16:05
@zalimeni zalimeni enabled auto-merge (squash) July 27, 2023 16:05
@zalimeni zalimeni merged commit 8dd9624 into release/1.15.x Jul 27, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-4904-bump-envoy-versions-docs/sharply-super-orca branch July 27, 2023 16:26
@jira jira bot mentioned this pull request Aug 28, 2023
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