Closed andyzhangx closed 3 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
/cherrypick release-1.23
/cherrypick release-1.22
@andyzhangx: new pull request created: #1335
@andyzhangx: new pull request created: #1336
@andyzhangx: #1334 failed to apply on top of branch "release-1.22":
Applying: feat: upgrade to azcopy v10.24.0 for volume clone feature
Using index info to reconstruct a base tree...
M pkg/blobplugin/Dockerfile
M test/sanity/run-test.sh
Falling back to patching base and 3-way merge...
Auto-merging test/sanity/run-test.sh
CONFLICT (content): Merge conflict in test/sanity/run-test.sh
Auto-merging pkg/blobplugin/Dockerfile
CONFLICT (content): Merge conflict in pkg/blobplugin/Dockerfile
Removing .trivyignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat: upgrade to azcopy v10.24.0 for volume clone feature
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 feature
What this PR does / why we need it: feat: upgrade to azcopy v10.24.0 for volume clone feature
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: