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

[8.16](backport #42056) Bump golang.org/x/crypto to v0.31.0 #42074

Merged
merged 1 commit into from
Dec 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 17, 2024

Proposed commit message

Bump golang.org/x/crypto to v0.31.0.

This fixes CVE-2024-45337.

Related issues


This is an automatic backport of pull request #42056 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner December 17, 2024 10:23
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 17, 2024
Copy link
Contributor Author

mergify bot commented Dec 17, 2024

Cherry-pick of 534ed1e has failed:

On branch mergify/bp/8.16/pr-42056
Your branch is up to date with 'origin/8.16'.

You are currently cherry-picking commit 534ed1e78.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 17, 2024
@botelastic
Copy link

botelastic bot commented Dec 17, 2024

This pull request doesn't have a Team:<team> label.

(cherry picked from commit 534ed1e)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@swiatekm swiatekm force-pushed the mergify/bp/8.16/pr-42056 branch from cd8a5c0 to c89952c Compare December 17, 2024 10:52
@swiatekm swiatekm enabled auto-merge (squash) December 17, 2024 10:55
@swiatekm swiatekm disabled auto-merge December 17, 2024 11:04
@swiatekm swiatekm enabled auto-merge (squash) December 17, 2024 11:45
@swiatekm swiatekm merged commit 9f42b61 into 8.16 Dec 17, 2024
141 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.16/pr-42056 branch December 17, 2024 12:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant