Skip to content

Conversation

@frenzyfriday
Copy link
Contributor

No description provided.

@github-actions github-actions bot marked this pull request as draft January 14, 2025 10:29
@github-actions
Copy link

Thanks for the PR! ❤️
I'm marking it as a draft, once your happy with it merging and the PR is passing CI, click the "Ready for review" button below.

@pablintino
Copy link
Contributor

/approve

@pablintino pablintino marked this pull request as ready for review January 14, 2025 10:30
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino

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

The pull request process is described here

Details 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

@pablintino
Copy link
Contributor

/lgtm

Copy link
Contributor

@evallesp evallesp left a comment

Choose a reason for hiding this comment

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

thanks!

@openshift-merge-bot openshift-merge-bot bot merged commit 5852999 into openstack-k8s-operators:main Jan 14, 2025
4 checks passed
@frenzyfriday
Copy link
Contributor Author

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@frenzyfriday: #2646 failed to apply on top of branch "18.0-fr1":

Applying: Adds cifmw squad to codeowners and owners files
Using index info to reconstruct a base tree...
A	.github/CODEOWNERS
M	OWNERS
Falling back to patching base and 3-way merge...
Auto-merging OWNERS
CONFLICT (content): Merge conflict in OWNERS
CONFLICT (modify/delete): .github/CODEOWNERS deleted in HEAD and modified in Adds cifmw squad to codeowners and owners files. Version Adds cifmw squad to codeowners and owners files of .github/CODEOWNERS 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 Adds cifmw squad to codeowners and owners files

Details

In response to this:

/cherry-pick 18.0-fr1

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.

@frenzyfriday
Copy link
Contributor Author

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@frenzyfriday: #2646 failed to apply on top of branch "18.0-fr1":

Applying: Adds cifmw squad to codeowners and owners files
Using index info to reconstruct a base tree...
M	OWNERS
Falling back to patching base and 3-way merge...
Auto-merging OWNERS
CONFLICT (content): Merge conflict in OWNERS
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 Adds cifmw squad to codeowners and owners files

Details

In response to this:

/cherry-pick 18.0-fr1

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.

@frenzyfriday
Copy link
Contributor Author

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@frenzyfriday: #2646 failed to apply on top of branch "18.0-fr1":

Applying: Adds cifmw squad to codeowners and owners files
Using index info to reconstruct a base tree...
M	OWNERS
Falling back to patching base and 3-way merge...
Auto-merging OWNERS
CONFLICT (content): Merge conflict in OWNERS
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 Adds cifmw squad to codeowners and owners files

Details

In response to this:

/cherry-pick 18.0-fr1

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.

@frenzyfriday
Copy link
Contributor Author

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@frenzyfriday: #2646 failed to apply on top of branch "18.0-fr1":

Applying: Adds cifmw squad to codeowners and owners files
Using index info to reconstruct a base tree...
M	OWNERS
Falling back to patching base and 3-way merge...
Auto-merging OWNERS
CONFLICT (content): Merge conflict in OWNERS
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 Adds cifmw squad to codeowners and owners files

Details

In response to this:

/cherry-pick 18.0-fr1

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.

@frenzyfriday
Copy link
Contributor Author

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@frenzyfriday: #2646 failed to apply on top of branch "18.0-fr1":

Applying: Adds cifmw squad to codeowners and owners files
Using index info to reconstruct a base tree...
M	OWNERS
Falling back to patching base and 3-way merge...
Auto-merging OWNERS
CONFLICT (content): Merge conflict in OWNERS
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 Adds cifmw squad to codeowners and owners files

Details

In response to this:

/cherry-pick 18.0-fr1

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.

@frenzyfriday
Copy link
Contributor Author

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@frenzyfriday: new pull request created: #2710

Details

In response to this:

/cherry-pick 18.0-fr1

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants