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

Restructure rdr #10542

Merged
merged 3 commits into from
Oct 7, 2024
Merged

Restructure rdr #10542

merged 3 commits into from
Oct 7, 2024

Conversation

prsurve
Copy link
Contributor

@prsurve prsurve commented Sep 20, 2024

No description provided.

Signed-off-by: prsurve <[email protected]>
@prsurve prsurve requested a review from a team as a code owner September 20, 2024 18:13
@pull-request-size pull-request-size bot added the size/M PR that changes 30-99 lines label Sep 20, 2024
@prsurve prsurve added the Verified Mark when PR was verified and log provided label Sep 24, 2024
am-agrawa
am-agrawa previously approved these changes Sep 26, 2024
Signed-off-by: prsurve <[email protected]>
Signed-off-by: prsurve <[email protected]>
@prsurve
Copy link
Contributor Author

prsurve commented Oct 7, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot
Copy link
Collaborator

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

In response to this:

/cherry-pick release-4.15

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.

@prsurve
Copy link
Contributor Author

prsurve commented Oct 7, 2024

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Collaborator

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

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.

Copy link

openshift-ci bot commented Oct 7, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: am-agrawa, keemano, keesturam, prsurve, sidhant-agrawal

The full list of commands accepted by this bot can be found 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

@keesturam keesturam merged commit 4bd53a2 into red-hat-storage:master Oct 7, 2024
6 of 7 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@prsurve: #10542 failed to apply on top of branch "release-4.15":

Applying: Restructure RDR
Using index info to reconstruct a base tree...
M	conf/ocsci/dr_workload.yaml
Falling back to patching base and 3-way merge...
Auto-merging conf/ocsci/dr_workload.yaml
CONFLICT (content): Merge conflict in conf/ocsci/dr_workload.yaml
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 Restructure RDR

In response to this:

/cherry-pick release-4.15

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.

@openshift-cherrypick-robot
Copy link
Collaborator

@prsurve: #10542 failed to apply on top of branch "release-4.16":

Applying: Restructure RDR
Using index info to reconstruct a base tree...
M	conf/ocsci/dr_workload.yaml
Falling back to patching base and 3-way merge...
Auto-merging conf/ocsci/dr_workload.yaml
CONFLICT (content): Merge conflict in conf/ocsci/dr_workload.yaml
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 Restructure RDR

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.

nagendra202 pushed a commit to nagendra202/ocs-ci that referenced this pull request Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm size/M PR that changes 30-99 lines Verified Mark when PR was verified and log provided
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants