Skip to content

Conversation

@maxwelldb
Copy link
Contributor

Additionally:

  • Adding OSP to common-atributes

Context: #17304

For 4.2.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 15, 2019
@maxwelldb
Copy link
Contributor Author

@bergerhoffer Do you want this one?

@bergerhoffer bergerhoffer self-requested a review October 15, 2019 20:14
Copy link
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few minor things, otherwise looks good!

@bergerhoffer bergerhoffer added peer-review-done Signifies that the peer review team has reviewed this PR branch/enterprise-4.2 labels Oct 15, 2019
@bergerhoffer bergerhoffer added this to the Future Release milestone Oct 15, 2019
@maxwelldb
Copy link
Contributor Author

@bergerhoffer Think I hit all of your comments. Let me know and I'll autosquash this.

@bergerhoffer
Copy link
Contributor

@maxwelldb Yep looks good to me now if you want to go ahead and squash! And then just let me know if you're ready for me to merge after that.

Adding OSP to common-atributes

Replacing OpenStack and RHOSP terms w/attributes
@maxwelldb maxwelldb force-pushed the openstack-branding-rename branch from cbac9f4 to 7bd4f87 Compare October 15, 2019 21:01
@maxwelldb
Copy link
Contributor Author

maxwelldb commented Oct 15, 2019

@bergerhoffer Done. Thanks!

Merge away.

@maxwelldb
Copy link
Contributor Author

Realized I reflexively edited in "Merge away" into that last comment. Just so that's in your inbox, too, hello @bergerhoffer

@bergerhoffer
Copy link
Contributor

Appreciate the clarification, merging/picking!

@bergerhoffer bergerhoffer merged commit 08c8503 into openshift:master Oct 15, 2019
@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.2

@openshift-cherrypick-robot

@bergerhoffer: #17323 failed to apply on top of branch "enterprise-4.2":

Using index info to reconstruct a base tree...
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-kuryr.adoc
M	installing/installing_openstack/installing-openstack-installer.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-initializing.adoc
M	modules/installation-launching-installer.adoc
M	modules/installation-osp-about-kuryr.adoc
M	modules/installation-osp-accessing-api-floating.adoc
M	modules/installation-osp-accessing-api.adoc
M	modules/installation-osp-balancing-external-loads.adoc
M	modules/installation-osp-config-yaml.adoc
M	modules/installation-osp-configuring-floating-ip.adoc
M	modules/installation-osp-creating-image.adoc
M	modules/installation-osp-default-deployment.adoc
M	modules/installation-osp-describing-cloud-parameters.adoc
M	modules/installation-osp-enabling-kuryr.adoc
M	modules/installation-osp-enabling-swift.adoc
M	modules/installation-osp-troubleshooting.adoc
M	modules/installation-osp-verifying-external-network.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-osp-verifying-external-network.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-verifying-external-network.adoc
Auto-merging modules/installation-osp-troubleshooting.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-troubleshooting.adoc
Auto-merging modules/installation-osp-enabling-swift.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-enabling-swift.adoc
Auto-merging modules/installation-osp-enabling-kuryr.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-enabling-kuryr.adoc
Auto-merging modules/installation-osp-describing-cloud-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-describing-cloud-parameters.adoc
Auto-merging modules/installation-osp-default-deployment.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-default-deployment.adoc
Auto-merging modules/installation-osp-creating-image.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-creating-image.adoc
Auto-merging modules/installation-osp-configuring-floating-ip.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-configuring-floating-ip.adoc
Auto-merging modules/installation-osp-config-yaml.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-config-yaml.adoc
Auto-merging modules/installation-osp-balancing-external-loads.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-balancing-external-loads.adoc
Auto-merging modules/installation-osp-accessing-api.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-accessing-api.adoc
Auto-merging modules/installation-osp-accessing-api-floating.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-accessing-api-floating.adoc
Auto-merging modules/installation-osp-about-kuryr.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-about-kuryr.adoc
Auto-merging modules/installation-launching-installer.adoc
CONFLICT (content): Merge conflict in modules/installation-launching-installer.adoc
Auto-merging modules/installation-initializing.adoc
CONFLICT (content): Merge conflict in modules/installation-initializing.adoc
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-installer.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-kuryr.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-installer-kuryr.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-custom.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-installer-custom.adoc
error: Failed to merge in the changes.
Patch failed at 0001 Indefinite article change for RHOSP abbreviation

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.

@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.2

@openshift-cherrypick-robot

@bergerhoffer: new pull request created: #17337

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.

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

Labels

branch/enterprise-4.2 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants