Giters

kubeclipper / console

kubeclipper web console

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

[release-1.3] fix: plugin cannot be removed when cluster is no running

kubeclipper-bot opened this issue · comments

commented

Manual cherrypick required.

#248 failed to apply on top of branch "release-1.3":

Applying: fix: plugin cannot be removed when cluster is no running
Using index info to reconstruct a base tree...
M	src/locales/en.json
M	src/locales/zh.json
Falling back to patching base and 3-way merge...
Auto-merging src/locales/zh.json
CONFLICT (content): Merge conflict in src/locales/zh.json
Auto-merging src/locales/en.json
CONFLICT (content): Merge conflict in src/locales/en.json
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: plugin cannot be removed when cluster is no running
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".
commented

/close

commented

@x893675: Closing this issue.

In response to this:

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.