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 Merge pull request #5288 from hashicorp/NET-3648_fix into release/1.15.x #17165

Merged

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: unable to process merge commit: "8221572b6e2b64fbdb58cab6b24c11a7bac17c76", automatic backport requires rebase workflow

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


NET-3648: perform envoy version verification
backport ENT -> OSS

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/cp_NET-3648_part2/genuinely-civil-toucan branch from 82e661c to 37973b8 Compare April 27, 2023 00:30
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/cp_NET-3648_part2/genuinely-civil-toucan branch from b25400b to b6fd391 Compare April 27, 2023 00:30
@github-actions github-actions bot added theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases labels Apr 27, 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

@NiniOak NiniOak marked this pull request as ready for review April 27, 2023 00:52
@NiniOak NiniOak enabled auto-merge (squash) April 27, 2023 00:52
@NiniOak NiniOak merged commit f048d35 into release/1.15.x Apr 27, 2023
@NiniOak NiniOak deleted the backport/cp_NET-3648_part2/genuinely-civil-toucan branch April 27, 2023 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants