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

cleanup: update OWNERS_ALIASES #86

Merged
merged 1 commit into from
Oct 12, 2023

Conversation

nixpanic
Copy link
Member

Humble left, and Riya joined the team.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Madhu-1, nixpanic

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

@nixpanic
Copy link
Member Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@nixpanic: 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/test-infra repository.

@nixpanic
Copy link
Member Author

/override codespell

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

@nixpanic: Overrode contexts on behalf of nixpanic: codespell

In response to this:

/override codespell

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.

@openshift-ci openshift-ci bot merged commit d7e5474 into red-hat-storage:main Oct 12, 2023
10 of 11 checks passed
@openshift-cherrypick-robot

@nixpanic: #86 failed to apply on top of branch "release-4.15":

Applying: cleanup: update OWNERS_ALIASES
Using index info to reconstruct a base tree...
A	OWNERS_ALIASES
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): OWNERS_ALIASES deleted in HEAD and modified in cleanup: update OWNERS_ALIASES. Version cleanup: update OWNERS_ALIASES of OWNERS_ALIASES left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 cleanup: update OWNERS_ALIASES
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.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/test-infra 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.

3 participants