Closed andyzhangx closed 1 month 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
/retest
/retest
/retest
/cherrypick release-1.24
/cherrypick release-1.23
/cherrypick release-1.22
@andyzhangx: new pull request created: #1631
@andyzhangx: new pull request created: #1632
@andyzhangx: #1630 failed to apply on top of branch "release-1.22":
Applying: chore: enable blobfuse-proxy by default in kubectl install
Applying: doc: support example pod running on arm64 node
Using index info to reconstruct a base tree...
A deploy/example/cloning/nginx-pod-restored-cloning.yaml
M deploy/example/nginx-blobfuse-inline-volume.yaml
M deploy/example/nginx-pod-blob.yaml
M deploy/example/statefulset-nfs.yaml
M deploy/example/statefulset.yaml
Falling back to patching base and 3-way merge...
Auto-merging deploy/example/statefulset.yaml
Auto-merging deploy/example/statefulset-nfs.yaml
Auto-merging deploy/example/nginx-pod-blob.yaml
Auto-merging deploy/example/nginx-blobfuse-inline-volume.yaml
CONFLICT (modify/delete): deploy/example/cloning/nginx-pod-restored-cloning.yaml deleted in HEAD and modified in doc: support example pod running on arm64 node. Version doc: support example pod running on arm64 node of deploy/example/cloning/nginx-pod-restored-cloning.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 doc: support example pod running on arm64 node
What type of PR is this? /kind cleanup
What this PR does / why we need it: chore: enable blobfuse-proxy by default in kubectl install
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: