Skip to content

Backport of chore: Update supported Envoy versions in ENVOY_VERSIONS file into release/1.20.x#22140

Merged
nitin-sachdev-29 merged 2 commits into
release/1.20.xfrom
backport/nitin/envoy-version-upgrade/absolutely-great-moose
Feb 12, 2025
Merged

Backport of chore: Update supported Envoy versions in ENVOY_VERSIONS file into release/1.20.x#22140
nitin-sachdev-29 merged 2 commits into
release/1.20.xfrom
backport/nitin/envoy-version-upgrade/absolutely-great-moose

Conversation

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

Backport

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

🚨

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:
@nitin-sachdev-29
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: "d158bfad61f9e196cededf0b81e57d1174087817", 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

Copy link
Copy Markdown
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

Copy link
Copy Markdown
Contributor

@nitin-sachdev-29 nitin-sachdev-29 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nitin-sachdev-29 nitin-sachdev-29 marked this pull request as ready for review February 12, 2025 08:10
@nitin-sachdev-29 nitin-sachdev-29 requested a review from a team as a code owner February 12, 2025 08:10
@nitin-sachdev-29 nitin-sachdev-29 enabled auto-merge (squash) February 12, 2025 08:10
Copy link
Copy Markdown
Contributor

@nitin-sachdev-29 nitin-sachdev-29 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nitin-sachdev-29 nitin-sachdev-29 merged commit 1e5c55d into release/1.20.x Feb 12, 2025
@nitin-sachdev-29 nitin-sachdev-29 deleted the backport/nitin/envoy-version-upgrade/absolutely-great-moose branch February 12, 2025 08:20
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.

3 participants