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

[release-4.17] catalog: update catalog files #481

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #480

/assign iamniting

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2024
Copy link
Contributor

openshift-ci bot commented Sep 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, openshift-cherrypick-robot

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 Sep 20, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit e478e8b into red-hat-storage:release-4.17 Sep 20, 2024
17 checks passed
@iamniting
Copy link
Member

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Author

@iamniting: #481 failed to apply on top of branch "release-4.16":

Applying: catalog: update catalog files
Using index info to reconstruct a base tree...
M	catalog/recipe.yaml
Falling back to patching base and 3-way merge...
Auto-merging catalog/recipe.yaml
CONFLICT (content): Merge conflict in catalog/recipe.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 catalog: update catalog files
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:

/cherry-pick release-4.16

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

Successfully merging this pull request may close these issues.

2 participants