Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.4] Fix kmesh daemon graceful exit #654

Closed
kmesh-bot opened this issue Jul 30, 2024 · 1 comment
Closed

[release-0.4] Fix kmesh daemon graceful exit #654

kmesh-bot opened this issue Jul 30, 2024 · 1 comment
Assignees

Comments

@kmesh-bot
Copy link
Collaborator

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".

@hzxuzhonghu
Copy link
Member

Fixed #657

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants