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-2420] security: add security scans on protected branches into release/1.1.x #444

Conversation

hc-github-team-consul-core

Backport

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

🚨

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

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


Changes proposed in this PR

See hashicorp/consul#19978 for similar changes in those repos, adapted here.


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 16, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-2420-align-k8s-dataplane-config/uniquely-correct-doe branch from b933fd2 to 5d57612 Compare February 17, 2024 04:09
@zalimeni zalimeni marked this pull request as ready for review February 17, 2024 04:09
@zalimeni zalimeni requested a review from a team February 17, 2024 04:09
@zalimeni zalimeni requested a review from a team as a code owner February 17, 2024 04:09
@zalimeni zalimeni requested review from sarahethompson and claire-labry and removed request for a team February 17, 2024 04:09
@zalimeni zalimeni enabled auto-merge (squash) February 17, 2024 04:10
@zalimeni zalimeni merged commit 6fb5a67 into release/1.1.x Feb 17, 2024
23 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/net-2420-align-k8s-dataplane-config/uniquely-correct-doe branch February 17, 2024 04:11
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