Skip to content

failed to cherry pick PR 5089 from lou-lan, to branch release-v1.0 #5173

@weizhoublue

Description

@weizhoublue

commits 3895e33 of lou-lan conflict when merging to branch release-v1.0, please manually cherry pick it by yourself.
PR #5089 , action https://github.com/spidernet-io/spiderpool/actions/runs/17933937225

Auto-merging charts/spiderpool/templates/daemonset.yaml
CONFLICT (content): Merge conflict in charts/spiderpool/templates/daemonset.yaml
Auto-merging pkg/rdmametrics/metrics.go
CONFLICT (content): Merge conflict in pkg/rdmametrics/metrics.go
Auto-merging pkg/rdmametrics/metrics_test.go
CONFLICT (content): Merge conflict in pkg/rdmametrics/metrics_test.go
error: could not apply 3895e3327... Add possible netns paths for rdma metrics expoter
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 set advice.mergeConflict false"

Metadata

Metadata

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions