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.

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

Fix the bug of renaming tag of mirror #572

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Fix the bug of renaming tag of mirror #572

merged 1 commit into from
Mar 28, 2023

Conversation

zhuzhenfan
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

Fix the bug of renaming tag of mirror

Which issue(s) this PR fixes:

Fixes #

Special notes for reviewers:

Does this PR introduced a user-facing change?

None

Additional documentation, usage docs, etc.:


Signed-off-by: zhuzhenfan <981189503@qq.com>
@kubeclipper-bot kubeclipper-bot added release-note-none kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 28, 2023
Copy link
Contributor

@lixd lixd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@kubeclipper-bot kubeclipper-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2023
@kubeclipper-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: af7385d9f6f165d265b62931ea7790d8990d026e

@x893675
Copy link
Collaborator

x893675 commented Mar 28, 2023

/approve

@kubeclipper-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lixd, x893675, zhuzhenfan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubeclipper-bot kubeclipper-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2023
@x893675
Copy link
Collaborator

x893675 commented Mar 28, 2023

/cherrypick master

@kubeclipper-bot
Copy link
Collaborator

@x893675: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

In response to this:

/cherrypick master

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.

@kubeclipper-bot kubeclipper-bot merged commit c5ea688 into kubeclipper:release-1.3 Mar 28, 2023
3 checks passed
@kubeclipper-bot
Copy link
Collaborator

@x893675: #572 failed to apply on top of branch "master":

Applying: Fix the bug of renaming tag of mirror
Using index info to reconstruct a base tree...
M	pkg/cli/registry/registry.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cli/registry/registry.go
CONFLICT (content): Merge conflict in pkg/cli/registry/registry.go
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 the bug of renaming tag of mirror
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".

In response to this:

/cherrypick master

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.

@kubeclipper-bot
Copy link
Collaborator

@x893675: new issue created for failed cherrypick: #573

In response to this:

/cherrypick master

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants