Closed andyzhangx closed 6 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: andyzhangx
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherrypick release-1.24
@andyzhangx: #1367 failed to apply on top of branch "release-1.24":
Applying: fix: CVE-2024-3177
Using index info to reconstruct a base tree...
M go.mod
M go.sum
M vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in 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 fix: CVE-2024-3177
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".
What type of PR is this? /kind bug
What this PR does / why we need it: fix: CVE-2024-3177
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: