Skip to content

Conversation

@jboxman
Copy link
Contributor

@jboxman jboxman commented Mar 10, 2021

Refs #27381.

The ref commit includes a merge commit. I have no idea how to rewind that, so this just takes a patch of the change and applies it on a clean branch.

@jboxman jboxman added this to the Next Release milestone Mar 10, 2021
@jboxman jboxman self-assigned this Mar 10, 2021
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 10, 2021
@netlify
Copy link

netlify bot commented Mar 10, 2021

Deploy preview for osdocs ready!

Built with commit c515080a59c4da54478f9a276c628214c9243148

https://deploy-preview-30341--osdocs.netlify.app

@netlify
Copy link

netlify bot commented Mar 10, 2021

Deploy preview for osdocs ready!

Built with commit 9c25899

https://deploy-preview-30341--osdocs.netlify.app

@jboxman jboxman merged commit aa5fb8d into openshift:master Mar 16, 2021
@jboxman jboxman deleted the fix-rhcos branch March 16, 2021 03:46
@jboxman
Copy link
Contributor Author

jboxman commented Mar 16, 2021

/cherry-pick enterprise-4.8

@openshift-cherrypick-robot

@jboxman: new pull request created: #30501

Details

In response to this:

/cherry-pick enterprise-4.8

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.

@jboxman
Copy link
Contributor Author

jboxman commented Mar 16, 2021

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot

@jboxman: new pull request created: #30502

Details

In response to this:

/cherry-pick enterprise-4.7

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.

@jboxman
Copy link
Contributor Author

jboxman commented Mar 16, 2021

/cherry-pick enterprise-4.6

@openshift-cherrypick-robot

@jboxman: new pull request created: #30503

Details

In response to this:

/cherry-pick enterprise-4.6

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.

@jboxman
Copy link
Contributor Author

jboxman commented Mar 16, 2021

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot

@jboxman: #30341 failed to apply on top of branch "enterprise-4.5":

Applying: Use op-system-first
Using index info to reconstruct a base tree...
A	security/compliance_operator/compliance-operator-understanding.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): security/compliance_operator/compliance-operator-understanding.adoc deleted in HEAD and modified in Use op-system-first. Version Use op-system-first of security/compliance_operator/compliance-operator-understanding.adoc 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 Use op-system-first
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".

Details

In response to this:

/cherry-pick enterprise-4.5

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