Skip to content

Conversation

@kalexand-rh
Copy link
Contributor

@kalexand-rh kalexand-rh added this to the Next Release milestone Nov 27, 2019
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 27, 2019
@openshift-docs-preview-bot

The preview will be available shortly at:

@vikram-redhat vikram-redhat merged commit 5f05a74 into openshift:master Nov 27, 2019
@vikram-redhat
Copy link
Contributor

/cherrypick enterprise-4.1

@openshift-cherrypick-robot

@vikram-redhat: #18351 failed to apply on top of branch "enterprise-4.1":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	updating/updating-cluster-between-minor.adoc
M	updating/updating-cluster-cli.adoc
M	updating/updating-cluster-rhel-compute.adoc
M	updating/updating-cluster.adoc
A	updating/updating-disconnected-cluster.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): updating/updating-disconnected-cluster.adoc deleted in HEAD and modified in bug 1777155 adding backup prereq to update. Version bug 1777155 adding backup prereq to update of updating/updating-disconnected-cluster.adoc left in tree.
Auto-merging updating/updating-cluster.adoc
Auto-merging updating/updating-cluster-rhel-compute.adoc
Auto-merging updating/updating-cluster-cli.adoc
CONFLICT (modify/delete): updating/updating-cluster-between-minor.adoc deleted in HEAD and modified in bug 1777155 adding backup prereq to update. Version bug 1777155 adding backup prereq to update of updating/updating-cluster-between-minor.adoc left in tree.
Patch failed at 0001 bug 1777155 adding backup prereq to update

Details

In response to this:

/cherrypick enterprise-4.1

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.

@vikram-redhat
Copy link
Contributor

/cherrypick enterprise-4.2

@openshift-cherrypick-robot

@vikram-redhat: new pull request created: #18352

Details

In response to this:

/cherrypick enterprise-4.2

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.

@vikram-redhat
Copy link
Contributor

/cherrypick enterprise-4.3

@openshift-cherrypick-robot

@vikram-redhat: new pull request created: #18353

Details

In response to this:

/cherrypick enterprise-4.3

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.1 branch/enterprise-4.2 branch/enterprise-4.3 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