search

spidernet-io / spiderpool

Underlay and RDMA network solution of the Kubernetes, for bare metal, VM and any public cloud
https://spidernet-io.github.io/spiderpool/
Apache License 2.0
503 stars 72 forks source link

failed to cherry pick PR 3584 from cyclinder, to branch release-v0.8 #3645

Closed weizhoublue closed 6 days ago

weizhoublue commented 1 week ago

commits ea0c8b96dc701275b113a592959a82426c3f1583 of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself. PR https://github.com/spidernet-io/spiderpool/pull/3584 , action https://github.com/spidernet-io/spiderpool/actions/runs/9641157948 

Auto-merging cmd/coordinator/cmd/cni_types.go
Auto-merging cmd/coordinator/cmd/command_add.go
CONFLICT (content): Merge conflict in cmd/coordinator/cmd/command_add.go
Auto-merging docs/concepts/coordinator-zh_CN.md
Auto-merging docs/concepts/coordinator.md
Auto-merging go.mod
Auto-merging go.sum
Auto-merging pkg/constant/errors.go
CONFLICT (content): Merge conflict in pkg/constant/errors.go
Auto-merging vendor/modules.txt
error: could not apply ea0c8b96... Merge pull request #3584 from cyclinder/coordinator/gw_detect_arping
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
weizhoublue commented 6 days ago

merged