Skip to content

Conversation

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 12, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@apinnick apinnick force-pushed the BZ1897071-cnv-remove-filesystem branch from 0be7367 to dbd9d7b Compare November 12, 2020 12:18
@apinnick apinnick marked this pull request as ready for review November 12, 2020 12:37
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 12, 2020
@aburdenthehand
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 12, 2020
@aburdenthehand aburdenthehand added branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 CNV Label for all CNV PRs and removed lgtm Indicates that a PR is ready to be merged. labels Nov 12, 2020
@aburdenthehand aburdenthehand added this to the Next Release milestone Nov 12, 2020
@aburdenthehand aburdenthehand merged commit 5389ef2 into openshift:master Nov 12, 2020
@aburdenthehand
Copy link
Contributor

aburdenthehand commented Nov 12, 2020

/cherry-pick enterprise-4.5

@aburdenthehand
Copy link
Contributor

aburdenthehand commented Nov 12, 2020

/cherry-pick enterprise-4.6

@aburdenthehand
Copy link
Contributor

aburdenthehand commented Nov 12, 2020

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 12, 2020

@aburdenthehand: #27300 failed to apply on top of branch "enterprise-4.5":

Applying: BZ1897071: Remove filesystem storage from VM import modules
Using index info to reconstruct a base tree...
M	modules/virt-features-for-storage-matrix.adoc
M	modules/virt-importing-vm-cli.adoc
M	modules/virt-importing-vm-wizard.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-importing-vm-wizard.adoc
CONFLICT (content): Merge conflict in modules/virt-importing-vm-wizard.adoc
Auto-merging modules/virt-importing-vm-cli.adoc
Auto-merging modules/virt-features-for-storage-matrix.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BZ1897071: Remove filesystem storage from VM import modules
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.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 12, 2020

@aburdenthehand: new pull request created: #27301

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.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 12, 2020

@aburdenthehand: new pull request created: #27302

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 CNV Label for all CNV PRs size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants