Bug 1526428: Flip planning bullets + ifdef openstack on origin content

[adellape]

xref: https://bugzilla.redhat.com/show_bug.cgi?id=1526428

[adellape]

/cherrypick enterprise-3.9

[openshift-cherrypick-robot]

@adellape: #8535 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	getting_started/administrators.adoc
M	install_config/install/planning.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/install/planning.adoc
CONFLICT (content): Merge conflict in install_config/install/planning.adoc
Auto-merging getting_started/administrators.adoc
CONFLICT (content): Merge conflict in getting_started/administrators.adoc
Patch failed at 0001 Flip planning bullets + ifdef openstack on origin content

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.

[adellape]

/cherrypick enterprise-3.10

[openshift-cherrypick-robot]

@adellape: #8535 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	getting_started/administrators.adoc
M	install_config/install/planning.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/install/planning.adoc
CONFLICT (content): Merge conflict in install_config/install/planning.adoc
Auto-merging getting_started/administrators.adoc
CONFLICT (content): Merge conflict in getting_started/administrators.adoc
Patch failed at 0001 Flip planning bullets + ifdef openstack on origin content

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.