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

[ART-11115] Remove ose-alibaba-machine-controllers #5602

Merged
merged 1 commit into from
Nov 4, 2024

Conversation

vfreex
Copy link
Contributor

@vfreex vfreex commented Oct 31, 2024

No description provided.

@vfreex
Copy link
Contributor Author

vfreex commented Oct 31, 2024

/cherry-pick openshift-4.17

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick openshift-4.17

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-sigs/prow repository.

@joepvd
Copy link
Contributor

joepvd commented Nov 4, 2024

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 4, 2024
Copy link
Contributor

openshift-ci bot commented Nov 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joepvd

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 4, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 28fdbd8 into openshift-eng:openshift-4.18 Nov 4, 2024
2 checks passed
@openshift-cherrypick-robot

@vfreex: #5602 failed to apply on top of branch "openshift-4.17":

Applying: Remove ose-alibaba-machine-controllers
Using index info to reconstruct a base tree...
M	images/ose-alibaba-machine-controllers.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): images/ose-alibaba-machine-controllers.yml deleted in Remove ose-alibaba-machine-controllers and modified in HEAD. Version HEAD of images/ose-alibaba-machine-controllers.yml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Remove ose-alibaba-machine-controllers

In response to this:

/cherry-pick openshift-4.17

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-sigs/prow 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants