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-8367] security: upgrade google.golang.org/protobuf to 1.33.0 into release/1.2.x #3721

Merged

Conversation

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

Backport

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

🚨

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

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


Changes proposed in this PR

Change made by running

make go-mod-get DEP_VERSION=google.golang.org/protobuf@v1.33.0
make go-mod-get DEP_VERSION=github.com/golang/protobuf@v1.5.4

to bump dependency across submodules

Checklist


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Mar 7, 2024

CLA assistant check
All committers have signed the CLA.

@wilkermichael wilkermichael force-pushed the backport/mw/bump-protobuf/badly-leading-marmot branch from 48dbe34 to 86cadf8 Compare March 7, 2024 21:33
@wilkermichael wilkermichael marked this pull request as ready for review March 7, 2024 21:37
@wilkermichael wilkermichael enabled auto-merge (squash) March 7, 2024 21:50
@wilkermichael wilkermichael merged commit 097780d into release/1.2.x Mar 7, 2024
23 of 47 checks passed
@wilkermichael wilkermichael deleted the backport/mw/bump-protobuf/badly-leading-marmot branch March 7, 2024 21:53
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