Skip to content

[release-1.0] Bump golang.org/x/net to address CVE-2024-45338 #1194

@kmesh-bot

Description

@kmesh-bot

Manual cherrypick required.

#1193 failed to apply on top of branch "release-1.0":

Applying: BUmp golang.org/x/net to address cve
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BUmp golang.org/x/net to address cve
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions