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.

Sign up for GitHub

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

Jump to bottom

Backport of Bump envoy 1.28.5 into release/1.4.x #581

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Backport of Bump envoy 1.28.5 into release/1.4.x #581

merged 1 commit into from
Jul 5, 2024

Conversation

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

Backport

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

🚨

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:
@sarahalsmiller
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-dataplane/merges: 409 Merge conflict []

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

Original PR had no description content.

Overview of commits

github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Jul 5, 2024
View reviewed changes
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

@hashicorp-cla-app HashiCorp CLA App
Copy link

hashicorp-cla-app bot commented Jul 5, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@sarahalsmiller sarahalsmiller changed the title Backport of Bump envoy 1.29.7 into release/1.4.x Backport of Bump envoy 1.28.5 into release/1.4.x Jul 5, 2024
@sarahalsmiller sarahalsmiller force-pushed the backport/bump-envoy-1.29.7/secondly-related-sawfly branch from b193f8a to a962a7d Compare July 5, 2024 15:45
@sarahalsmiller sarahalsmiller marked this pull request as ready for review July 5, 2024 15:45
@sarahalsmiller sarahalsmiller requested a review from a team as a code owner July 5, 2024 15:45
@sarahalsmiller sarahalsmiller enabled auto-merge (squash) July 5, 2024 15:45
@sarahalsmiller sarahalsmiller merged commit 5bf1d45 into release/1.4.x Jul 5, 2024
42 checks passed
@sarahalsmiller sarahalsmiller deleted the backport/bump-envoy-1.29.7/secondly-related-sawfly branch July 5, 2024 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@dduzgun-security dduzgun-security dduzgun-security approved these changes

@sarahalsmiller sarahalsmiller Awaiting requested review from sarahalsmiller

Assignees

@sarahalsmiller sarahalsmiller

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hc-github-team-consul-core @dduzgun-security @github-team-consul-core-pr-approver @sarahalsmiller