We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
commits 53dcfeb of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself. PR #3906 , action https://github.com/spidernet-io/spiderpool/actions/runs/10554320193
Auto-merging api/v1/agent/models/coordinator_config.go Auto-merging api/v1/agent/openapi.yaml Auto-merging api/v1/agent/server/embedded_spec.go Auto-merging charts/spiderpool/crds/spiderpool.spidernet.io_spidercoordinators.yaml CONFLICT (content): Merge conflict in charts/spiderpool/crds/spiderpool.spidernet.io_spidercoordinators.yaml Auto-merging charts/spiderpool/crds/spiderpool.spidernet.io_spidermultusconfigs.yaml CONFLICT (content): Merge conflict in charts/spiderpool/crds/spiderpool.spidernet.io_spidermultusconfigs.yaml Auto-merging cmd/coordinator/cmd/cni_types.go CONFLICT (content): Merge conflict in cmd/coordinator/cmd/cni_types.go Auto-merging cmd/coordinator/cmd/command_add.go Auto-merging cmd/spiderpool-agent/cmd/coordinator.go CONFLICT (content): Merge conflict in cmd/spiderpool-agent/cmd/coordinator.go Auto-merging docs/concepts/coordinator-zh_CN.md CONFLICT (content): Merge conflict in docs/concepts/coordinator-zh_CN.md Auto-merging docs/concepts/coordinator.md CONFLICT (content): Merge conflict in docs/concepts/coordinator.md Auto-merging docs/reference/crd-spidercoordinator.md CONFLICT (content): Merge conflict in docs/reference/crd-spidercoordinator.md Auto-merging docs/usage/install/overlay/get-started-calico-zh_cn.md Auto-merging docs/usage/install/overlay/get-started-calico.md Auto-merging docs/usage/install/overlay/get-started-cilium-zh_cn.md Auto-merging docs/usage/install/overlay/get-started-cilium.md Auto-merging docs/usage/install/underlay/get-started-macvlan-zh_CN.md CONFLICT (content): Merge conflict in docs/usage/install/underlay/get-started-macvlan-zh_CN.md Auto-merging docs/usage/install/underlay/get-started-macvlan.md CONFLICT (content): Merge conflict in docs/usage/install/underlay/get-started-macvlan.md Auto-merging docs/usage/install/underlay/get-started-ovs-zh_CN.md Auto-merging docs/usage/install/underlay/get-started-ovs.md Auto-merging pkg/coordinatormanager/coordinator_mutate.go Auto-merging pkg/coordinatormanager/coordinator_validate.go CONFLICT (content): Merge conflict in pkg/coordinatormanager/coordinator_validate.go Auto-merging pkg/k8s/apis/spiderpool.spidernet.io/v2beta1/spidercoordinator_types.go CONFLICT (content): Merge conflict in pkg/k8s/apis/spiderpool.spidernet.io/v2beta1/spidercoordinator_types.go Auto-merging pkg/k8s/apis/spiderpool.spidernet.io/v2beta1/zz_generated.deepcopy.go CONFLICT (content): Merge conflict in pkg/k8s/apis/spiderpool.spidernet.io/v2beta1/zz_generated.deepcopy.go Auto-merging pkg/multuscniconfig/multusconfig_informer.go CONFLICT (content): Merge conflict in pkg/multuscniconfig/multusconfig_informer.go Auto-merging pkg/multuscniconfig/utils.go Auto-merging test/e2e/coordinator/macvlan-overlay-one/macvlan_overlay_one_test.go error: could not apply 53dcfeb9... Merge pull request #3906 from cyclinder/spidermultusconfig/hostRPFilter 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"
The text was updated successfully, but these errors were encountered:
#3970
Sorry, something went wrong.
weizhoublue
cyclinder
No branches or pull requests
commits 53dcfeb of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #3906 , action https://github.com/spidernet-io/spiderpool/actions/runs/10554320193
The text was updated successfully, but these errors were encountered: