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 Fix supression into release/1.19.x #21745

Conversation

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

Backport

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

🚨

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

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


Description

Suppression statement was under binary and not container

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

hashicorp-cla-app bot commented Sep 16, 2024

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

@sarahalsmiller sarahalsmiller marked this pull request as ready for review September 16, 2024 19:32
@sarahalsmiller sarahalsmiller requested a review from a team as a code owner September 16, 2024 19:32
@sarahalsmiller sarahalsmiller enabled auto-merge (squash) September 16, 2024 19:33
@sarahalsmiller sarahalsmiller force-pushed the backport/fix-supression-statement/promptly-clever-yeti branch from 032d3e4 to 0413fee Compare September 16, 2024 19:36
@sarahalsmiller sarahalsmiller merged commit dda31b8 into release/1.19.x Sep 16, 2024
93 checks passed
@sarahalsmiller sarahalsmiller deleted the backport/fix-supression-statement/promptly-clever-yeti branch September 16, 2024 19:54
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