Closed yudong2015 closed 1 year ago
/cherry-pick release-3.4 /cherry-pick release-3.5
@yudong2015: once the present PR merges, I will cherry-pick it on top of release-3.4 in a new PR and assign it to you.
/lgtm /approve
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: chilianyi
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@yudong2015: #1009 failed to apply on top of branch "release-3.4":
Applying: fix: config argoCD and fluxCD by kubesphere.yaml
Applying: filter out ApiVersions that not start with /kapis
Applying: update swagger info
error: patch failed: docs/swagger.md:7
error: docs/swagger.md: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
Patch failed at 0003 update swagger info
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".
@yudong2015: new issue created for failed cherrypick: #1010
@yudong2015: #1009 failed to apply on top of branch "release-3.5":
Applying: fix: config argoCD and fluxCD by kubesphere.yaml
Applying: filter out ApiVersions that not start with /kapis
Applying: update swagger info
error: patch failed: docs/swagger.md:7
error: docs/swagger.md: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
Patch failed at 0003 update swagger info
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".
@yudong2015: new issue created for failed cherrypick: #1011
/cherry-pick release-3.4
@yudong2015: #1009 failed to apply on top of branch "release-3.4":
Applying: fix: config argoCD and fluxCD by kubesphere.yaml
Applying: filter out ApiVersions that not start with /kapis
Applying: update swagger info
error: patch failed: docs/swagger.md:7
error: docs/swagger.md: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
Patch failed at 0003 update swagger info
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".
@yudong2015: new issue created for failed cherrypick: #1012
/cherrypick release-3.5
@yudong2015: #1009 failed to apply on top of branch "release-3.5":
Applying: fix: config argoCD and fluxCD by kubesphere.yaml
Applying: filter out ApiVersions that not start with /kapis
Applying: update swagger info
error: patch failed: docs/swagger.md:7
error: docs/swagger.md: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
Patch failed at 0003 update swagger info
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".
@yudong2015: new issue created for failed cherrypick: #1013
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #1008
Special notes for reviewers:
Please check the following list before waiting reviewers:
Does this PR introduce a user-facing change??