Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

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

Jump to bottom

[release-3.4] update storageclass-accessor webhook #5932

Open
ks-ci-bot opened this issue Oct 7, 2023 · 1 comment
Open

[release-3.4] update storageclass-accessor webhook #5932

ks-ci-bot opened this issue Oct 7, 2023 · 1 comment
Assignees
@wansir
Labels
stale No recent activity in a long period

Comments

@ks-ci-bot
Copy link
Collaborator

Manual cherrypick required.

#5927 failed to apply on top of branch "release-3.4":

Applying: update storageclass-accessor webhook
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/src/kubesphere.io/api/go.sum
M	staging/src/kubesphere.io/client-go/go.sum
M	staging/src/kubesphere.io/utils/go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging staging/src/kubesphere.io/utils/go.sum
CONFLICT (content): Merge conflict in staging/src/kubesphere.io/utils/go.sum
Auto-merging staging/src/kubesphere.io/client-go/go.sum
CONFLICT (content): Merge conflict in staging/src/kubesphere.io/client-go/go.sum
Auto-merging staging/src/kubesphere.io/api/go.sum
Auto-merging go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update storageclass-accessor webhook
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".
@ks-ci-bot ks-ci-bot mentioned this issue Oct 7, 2023
Merged
@stale Stale
Copy link

stale bot commented Mar 17, 2024

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Any further update will cause the issue/pull request to no longer be considered stale. Thank you for your contributions.

@stale stale bot added the stale No recent activity in a long period label Mar 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@wansir wansir

Labels
stale No recent activity in a long period
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@wansir @ks-ci-bot