Skip to content

Conversation

@sheriff-rh
Copy link
Contributor

Changes to master here:
#13567

@sheriff-rh sheriff-rh added this to the Next Release milestone Feb 21, 2019
@sheriff-rh sheriff-rh self-assigned this Feb 21, 2019
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 21, 2019
Revised _topic_map.yml

additional xPaaS changes
@sheriff-rh sheriff-rh merged commit d6af4b2 into openshift:enterprise-3.10 Feb 21, 2019
@sheriff-rh
Copy link
Contributor Author

/cherrypick enterprise-3.9

@openshift-cherrypick-robot

@sheriff-rh: #13715 failed to apply on top of branch "enterprise-3.9":

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

Details

In response to this:

/cherrypick enterprise-3.9

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.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