-
Notifications
You must be signed in to change notification settings - Fork 174
[release-0.4] Fix kmesh daemon graceful exit #654
Copy link
Copy link
Closed
Description
Manual cherrypick required.
#651 failed to apply on top of branch "release-0.4":
Applying: Fix kmesh daemon graceful exit
Using index info to reconstruct a base tree...
M build/docker/start_kmesh.sh
A pkg/bpf/bpf_restart.go
M pkg/status/status_server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/status/status_server.go
CONFLICT (modify/delete): pkg/bpf/bpf_restart.go deleted in HEAD and modified in Fix kmesh daemon graceful exit. Version Fix kmesh daemon graceful exit of pkg/bpf/bpf_restart.go left in tree.
Auto-merging build/docker/start_kmesh.sh
CONFLICT (content): Merge conflict in build/docker/start_kmesh.sh
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 kmesh daemon graceful exit
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".
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels