Skip to content

Conversation

@sheriff-rh
Copy link
Contributor

Changes to master here:
#13567

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 20, 2019
@sheriff-rh
Copy link
Contributor Author

/cherrypick enterprise-3.10

@openshift-cherrypick-robot

@sheriff-rh: #13700 failed to apply on top of branch "enterprise-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	install/configuring_inventory_file.adoc
M	using_images/xpaas_images/index.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
CONFLICT (modify/delete): using_images/xpaas_images/index.adoc deleted in issue 13527 removed xPaaS image links and modified in HEAD. Version HEAD of using_images/xpaas_images/index.adoc left in tree.
Auto-merging install/configuring_inventory_file.adoc
Auto-merging _topic_map.yml
Patch failed at 0001 issue 13527 removed xPaaS image links

Details

In response to this:

/cherrypick enterprise-3.10

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-3.7 branch/enterprise-3.9 branch/enterprise-3.10 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.

3 participants