Skip to content

Conversation

@codyhoag
Copy link
Contributor

No description provided.

@codyhoag codyhoag added this to the Next Release milestone Nov 24, 2020
@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 24, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 1, 2020
@codyhoag codyhoag force-pushed the installer-terminology branch from c928dc9 to 30a5c2c Compare December 1, 2020 21:24
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 1, 2020
@codyhoag codyhoag force-pushed the installer-terminology branch from 2d483eb to dc0c228 Compare December 3, 2020 22:10
@codyhoag codyhoag changed the title [WIP] Applying new style guidelines for Install docs Applying new style guidelines for Install docs Dec 3, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 3, 2020
@codyhoag codyhoag force-pushed the installer-terminology branch from dc0c228 to 2084a1c Compare December 4, 2020 14:17
@codyhoag codyhoag added the peer-review-needed Signifies that the peer review team needs to review this PR label Dec 4, 2020
Copy link
Contributor

@jboxman jboxman left a comment

Choose a reason for hiding this comment

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

I've left a few comments for your review.

I do wonder about capitalizing Ingress.

@jboxman jboxman added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Dec 4, 2020
@codyhoag codyhoag force-pushed the installer-terminology branch from 2084a1c to 8932a0b Compare December 4, 2020 21:41
@codyhoag codyhoag merged commit 38be4c1 into openshift:master Dec 4, 2020
@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 4, 2020

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 4, 2020

@codyhoag: #27633 failed to apply on top of branch "enterprise-4.7":

Applying: Installation terminology updates
Using index info to reconstruct a base tree...
M	installing/install_config/customizations.adoc
M	installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
M	installing/installing_rhv/installing-rhv-customizations.adoc
M	installing/installing_rhv/installing-rhv-default.adoc
M	modules/installation-about-restricted-network.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-ibm-z-user-infra-machines-iso.adoc
M	modules/installation-initializing.adoc
M	modules/installation-osp-creating-control-plane.adoc
M	modules/installation-osp-verifying-external-network.adoc
M	modules/installation-registry-storage-config.adoc
M	modules/installation-registry-storage-non-production.adoc
M	modules/installation-user-infra-machines-advanced.adoc
M	modules/ipi-install-creating-an-rhcos-images-cache.adoc
M	modules/ipi-install-troubleshooting-bootstrap-vm.adoc
M	modules/ipi-install-troubleshooting-install-config.adoc
M	modules/registry-configuring-storage-baremetal.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/registry-configuring-storage-baremetal.adoc
Auto-merging modules/ipi-install-troubleshooting-install-config.adoc
Auto-merging modules/ipi-install-troubleshooting-bootstrap-vm.adoc
Auto-merging modules/ipi-install-creating-an-rhcos-images-cache.adoc
Auto-merging modules/installation-user-infra-machines-advanced.adoc
Auto-merging modules/installation-registry-storage-config.adoc
Auto-merging modules/installation-osp-verifying-external-network.adoc
Auto-merging modules/installation-osp-creating-control-plane.adoc
Auto-merging modules/installation-initializing.adoc
Auto-merging modules/installation-ibm-z-user-infra-machines-iso.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/installation-about-restricted-network.adoc
Auto-merging installing/installing_rhv/installing-rhv-default.adoc
CONFLICT (content): Merge conflict in installing/installing_rhv/installing-rhv-default.adoc
Auto-merging installing/installing_rhv/installing-rhv-customizations.adoc
Auto-merging installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
Auto-merging installing/install_config/customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Installation terminology updates
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.7

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.

@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 4, 2020

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 4, 2020

@codyhoag: #27633 failed to apply on top of branch "enterprise-4.6":

Applying: Installation terminology updates
Using index info to reconstruct a base tree...
M	installing/install_config/customizations.adoc
M	installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
M	installing/installing_rhv/installing-rhv-customizations.adoc
M	installing/installing_rhv/installing-rhv-default.adoc
M	modules/installation-about-restricted-network.adoc
M	modules/installation-aws-permissions.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-ibm-z-user-infra-machines-iso.adoc
M	modules/installation-initializing.adoc
M	modules/installation-osp-verifying-external-network.adoc
M	modules/installation-registry-storage-config.adoc
M	modules/installation-registry-storage-non-production.adoc
M	modules/installation-user-infra-machines-advanced.adoc
M	modules/ipi-install-creating-an-rhcos-images-cache.adoc
M	modules/ipi-install-troubleshooting-bootstrap-vm.adoc
M	modules/ipi-install-troubleshooting-install-config.adoc
M	modules/registry-configuring-storage-baremetal.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/registry-configuring-storage-baremetal.adoc
Auto-merging modules/ipi-install-troubleshooting-install-config.adoc
Auto-merging modules/ipi-install-troubleshooting-bootstrap-vm.adoc
Auto-merging modules/ipi-install-creating-an-rhcos-images-cache.adoc
Auto-merging modules/installation-user-infra-machines-advanced.adoc
Auto-merging modules/installation-registry-storage-config.adoc
Auto-merging modules/installation-osp-verifying-external-network.adoc
Auto-merging modules/installation-initializing.adoc
Auto-merging modules/installation-ibm-z-user-infra-machines-iso.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/installation-aws-permissions.adoc
Auto-merging modules/installation-about-restricted-network.adoc
Auto-merging installing/installing_rhv/installing-rhv-default.adoc
CONFLICT (content): Merge conflict in installing/installing_rhv/installing-rhv-default.adoc
Auto-merging installing/installing_rhv/installing-rhv-customizations.adoc
Auto-merging installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
Auto-merging installing/install_config/customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Installation terminology updates
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.6

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.

@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 4, 2020

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 4, 2020

@codyhoag: #27633 failed to apply on top of branch "enterprise-4.5":

Applying: Installation terminology updates
Using index info to reconstruct a base tree...
M	installing/install_config/customizations.adoc
M	installing/installing_aws/installing-aws-network-customizations.adoc
M	installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc
M	installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
M	installing/installing_ibm_power/installing-ibm-power.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
M	installing/installing_ibm_z/installing-ibm-z.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-kuryr.adoc
M	installing/installing_openstack/installing-openstack-user-kuryr.adoc
M	installing/installing_openstack/installing-openstack-user.adoc
M	installing/installing_rhv/installing-rhv-customizations.adoc
M	installing/installing_rhv/installing-rhv-default.adoc
M	modules/admin-credentials-root-secret-formats.adoc
M	modules/cluster-entitlements.adoc
M	modules/installation-about-custom-azure-vnet.adoc
M	modules/installation-about-restricted-network.adoc
M	modules/installation-aws-config-yaml.adoc
M	modules/installation-aws-permissions.adoc
M	modules/installation-aws-regions.adoc
M	modules/installation-aws-user-infra-requirements.adoc
M	modules/installation-azure-config-yaml.adoc
M	modules/installation-azure-regions.adoc
M	modules/installation-azure-service-principal.adoc
A	modules/installation-azure-user-defined-routing.adoc
M	modules/installation-bare-metal-config-yaml.adoc
M	modules/installation-common-issues.adoc
M	modules/installation-complete-user-infra.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-configure-proxy.adoc
M	modules/installation-creating-aws-control-plane.adoc
M	modules/installation-creating-aws-dns.adoc
M	modules/installation-creating-aws-worker.adoc
M	modules/installation-creating-azure-bootstrap.adoc
M	modules/installation-creating-azure-control-plane.adoc
M	modules/installation-creating-azure-worker.adoc
M	modules/installation-custom-aws-vpc.adoc
M	modules/installation-deployment-manager-worker.adoc
M	modules/installation-gcp-user-infra-rhcos.adoc
M	modules/installation-generate-aws-user-infra-install-config.adoc
M	modules/installation-ibm-z-user-infra-machines-iso.adoc
M	modules/installation-initializing.adoc
M	modules/installation-installing-bare-metal.adoc
M	modules/installation-launching-installer.adoc
M	modules/installation-network-user-infra.adoc
M	modules/installation-osp-converting-ignition-resources.adoc
M	modules/installation-osp-creating-control-plane.adoc
M	modules/installation-osp-kuryr-known-limitations.adoc
M	modules/installation-osp-verifying-cluster-status.adoc
M	modules/installation-osp-verifying-external-network.adoc
M	modules/installation-registry-storage-config.adoc
M	modules/installation-registry-storage-non-production.adoc
M	modules/installation-restricted-network-samples.adoc
A	modules/installation-rhv-about-inventory-yml.adoc
A	modules/installation-rhv-building-ignition-files.adoc
A	modules/installation-rhv-creating-bootstrap-machine.adoc
A	modules/installation-rhv-creating-install-config-file.adoc
A	modules/installation-rhv-creating-templates-virtual-machines.adoc
A	modules/installation-rhv-customizing-install-config-yaml.adoc
A	modules/installation-rhv-editing-manifests.adoc
A	modules/installation-rhv-making-control-plane-nodes-non-schedulable.adoc
A	modules/installation-rhv-removing-cluster-upi.adoc
A	modules/installation-rhv-specifying-rhcos-image-settings.adoc
M	modules/installation-special-config-crony.adoc
M	modules/installation-special-config-encrypt-disk-tang.adoc
M	modules/installation-special-config-kmod.adoc
A	modules/installation-user-infra-machines-advanced.adoc
M	modules/installation-user-infra-machines-iso.adoc
M	modules/installation-user-infra-machines-pxe.adoc
M	modules/installation-vsphere-machines.adoc
A	modules/installing-rhv-accessing-ocp-web-console.adoc
A	modules/installing-rhv-network-infrastructure-configuration-upi.adoc
A	modules/installing-rhv-preparing-network-environment.adoc
A	modules/installing-rhv-setting-up-installation-machine.adoc
M	modules/ipi-install-additional-install-config-parameters.adoc
M	modules/ipi-install-bmc-addressing.adoc
M	modules/ipi-install-configuring-nodes.adoc
M	modules/ipi-install-creating-a-disconnected-registry.adoc
M	modules/ipi-install-creating-an-rhcos-images-cache.adoc
A	modules/ipi-install-ipv6-network-requirements.adoc
M	modules/ipi-install-network-requirements.adoc
M	modules/ipi-install-node-requirements.adoc
A	modules/ipi-install-root-device-hints.adoc
M	modules/ipi-install-troubleshooting-bootstrap-vm.adoc
M	modules/ipi-install-troubleshooting-install-config.adoc
M	modules/ipi-install-troubleshooting-misc-issues.adoc
M	modules/ipi-install-troubleshooting-ntp-out-of-sync.adoc
M	modules/ipi-install-validation-checklist-for-nodes.adoc
M	modules/manually-create-identity-access-management.adoc
M	modules/manually-maintained-credentials-upgrade.adoc
A	modules/nw-endpoint-route53.adoc
M	modules/nw-install-config-parameters.adoc
M	modules/nw-operator-cr.adoc
M	modules/private-clusters-about-aws.adoc
M	modules/private-clusters-about-azure.adoc
M	modules/private-clusters-default.adoc
M	modules/registry-configuring-storage-baremetal.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/registry-configuring-storage-baremetal.adoc
Auto-merging modules/private-clusters-default.adoc
CONFLICT (content): Merge conflict in modules/private-clusters-default.adoc
Auto-merging modules/private-clusters-about-azure.adoc
Auto-merging modules/private-clusters-about-aws.adoc
Auto-merging modules/nw-operator-cr.adoc
Auto-merging modules/nw-install-config-parameters.adoc
CONFLICT (modify/delete): modules/nw-endpoint-route53.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/nw-endpoint-route53.adoc left in tree.
Auto-merging modules/manually-maintained-credentials-upgrade.adoc
CONFLICT (content): Merge conflict in modules/manually-maintained-credentials-upgrade.adoc
Auto-merging modules/manually-create-identity-access-management.adoc
CONFLICT (content): Merge conflict in modules/manually-create-identity-access-management.adoc
Auto-merging modules/ipi-install-validation-checklist-for-nodes.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-validation-checklist-for-nodes.adoc
Auto-merging modules/ipi-install-troubleshooting-ntp-out-of-sync.adoc
Auto-merging modules/ipi-install-troubleshooting-misc-issues.adoc
Auto-merging modules/ipi-install-troubleshooting-install-config.adoc
Auto-merging modules/ipi-install-troubleshooting-bootstrap-vm.adoc
CONFLICT (modify/delete): modules/ipi-install-root-device-hints.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/ipi-install-root-device-hints.adoc left in tree.
Auto-merging modules/ipi-install-node-requirements.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-node-requirements.adoc
Auto-merging modules/ipi-install-network-requirements.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-network-requirements.adoc
CONFLICT (modify/delete): modules/ipi-install-ipv6-network-requirements.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/ipi-install-ipv6-network-requirements.adoc left in tree.
Auto-merging modules/ipi-install-creating-an-rhcos-images-cache.adoc
Auto-merging modules/ipi-install-creating-a-disconnected-registry.adoc
Auto-merging modules/ipi-install-configuring-nodes.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-configuring-nodes.adoc
Auto-merging modules/ipi-install-bmc-addressing.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-bmc-addressing.adoc
Auto-merging modules/ipi-install-additional-install-config-parameters.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-additional-install-config-parameters.adoc
CONFLICT (modify/delete): modules/installing-rhv-setting-up-installation-machine.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installing-rhv-setting-up-installation-machine.adoc left in tree.
Auto-merging modules/installing-rhv-preparing-the-network-environment.adoc
CONFLICT (modify/delete): modules/installing-rhv-network-infrastructure-configuration-upi.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installing-rhv-network-infrastructure-configuration-upi.adoc left in tree.
Auto-merging modules/installing-rhv-accessing-the-ocp-web-console.adoc
Auto-merging modules/installation-vsphere-machines.adoc
Auto-merging modules/installation-user-infra-machines-pxe.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-iso.adoc
CONFLICT (modify/delete): modules/installation-user-infra-machines-advanced.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-user-infra-machines-advanced.adoc left in tree.
Auto-merging modules/installation-special-config-kmod.adoc
Auto-merging modules/installation-special-config-encrypt-disk-tang.adoc
Auto-merging modules/installation-special-config-crony.adoc
CONFLICT (modify/delete): modules/installation-rhv-specifying-rhcos-image-settings.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-specifying-rhcos-image-settings.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-removing-cluster-upi.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-removing-cluster-upi.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-making-control-plane-nodes-non-schedulable.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-making-control-plane-nodes-non-schedulable.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-editing-manifests.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-editing-manifests.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-customizing-install-config-yaml.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-customizing-install-config-yaml.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-creating-templates-virtual-machines.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-creating-templates-virtual-machines.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-creating-install-config-file.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-creating-install-config-file.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-creating-bootstrap-machine.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-creating-bootstrap-machine.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-building-ignition-files.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-building-ignition-files.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-about-inventory-yml.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-about-inventory-yml.adoc left in tree.
Auto-merging modules/installation-restricted-network-samples.adoc
CONFLICT (content): Merge conflict in modules/installation-restricted-network-samples.adoc
Auto-merging modules/installation-registry-storage-non-production.adoc
Auto-merging modules/installation-registry-storage-config.adoc
Auto-merging modules/installation-osp-verifying-external-network.adoc
Auto-merging modules/installation-osp-verifying-cluster-status.adoc
Auto-merging modules/installation-osp-kuryr-known-limitations.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-kuryr-known-limitations.adoc
Auto-merging modules/installation-osp-creating-control-plane.adoc
Auto-merging modules/installation-osp-converting-ignition-resources.adoc
Auto-merging modules/installation-network-user-infra.adoc
Auto-merging modules/installation-launching-installer.adoc
Auto-merging modules/installation-installing-bare-metal.adoc
Auto-merging modules/installation-initializing.adoc
Auto-merging modules/installation-ibm-z-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-ibm-z-user-infra-machines-iso.adoc
Auto-merging modules/installation-generate-aws-user-infra-install-config.adoc
Auto-merging modules/installation-gcp-user-infra-rhcos.adoc
Auto-merging modules/installation-deployment-manager-worker.adoc
Auto-merging modules/installation-custom-aws-vpc.adoc
Auto-merging modules/installation-creating-azure-worker.adoc
Auto-merging modules/installation-creating-azure-control-plane.adoc
Auto-merging modules/installation-creating-azure-bootstrap.adoc
Auto-merging modules/installation-creating-aws-worker.adoc
Auto-merging modules/installation-creating-aws-dns.adoc
Auto-merging modules/installation-creating-aws-control-plane.adoc
Auto-merging modules/installation-configure-proxy.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/installation-complete-user-infra.adoc
Auto-merging modules/installation-common-issues.adoc
CONFLICT (content): Merge conflict in modules/installation-common-issues.adoc
Auto-merging modules/installation-bare-metal-config-yaml.adoc
CONFLICT (modify/delete): modules/installation-azure-user-defined-routing.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-azure-user-defined-routing.adoc left in tree.
Auto-merging modules/installation-azure-service-principal.adoc
Auto-merging modules/installation-azure-regions.adoc
CONFLICT (content): Merge conflict in modules/installation-azure-regions.adoc
Auto-merging modules/installation-azure-config-yaml.adoc
CONFLICT (content): Merge conflict in modules/installation-azure-config-yaml.adoc
Auto-merging modules/installation-aws-user-infra-requirements.adoc
Auto-merging modules/installation-aws-regions.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-regions.adoc
Auto-merging modules/installation-aws-permissions.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-permissions.adoc
Auto-merging modules/installation-aws-config-yaml.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-config-yaml.adoc
Auto-merging modules/installation-about-restricted-network.adoc
Auto-merging modules/installation-about-custom-azure-vnet.adoc
Auto-merging modules/cluster-entitlements.adoc
Auto-merging modules/admin-credentials-root-secret-formats.adoc
Auto-merging installing/installing_rhv/installing-rhv-default.adoc
Auto-merging installing/installing_rhv/installing-rhv-customizations.adoc
Auto-merging installing/installing_openstack/installing-openstack-user.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user.adoc
Auto-merging installing/installing_openstack/installing-openstack-user-kuryr.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user-kuryr.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
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/installing-ibm-z.adoc
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_power/installing-ibm-power.adoc
Auto-merging installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
Auto-merging installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc
Auto-merging installing/installing_aws/installing-aws-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-network-customizations.adoc
Auto-merging installing/install_config/customizations.adoc
CONFLICT (content): Merge conflict in installing/install_config/customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Installation terminology updates
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.5

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.

@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 4, 2020

/cherrypick enterprise-4.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 4, 2020

@codyhoag: #27633 failed to apply on top of branch "enterprise-4.4":

Applying: Installation terminology updates
Using index info to reconstruct a base tree...
M	installing/install_config/customizations.adoc
M	installing/install_config/installing-customizing.adoc
M	installing/installing_aws/installing-aws-network-customizations.adoc
M	installing/installing_aws/installing-restricted-networks-aws.adoc
M	installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc
M	installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
M	installing/installing_ibm_power/installing-ibm-power.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
M	installing/installing_ibm_z/installing-ibm-z.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-kuryr.adoc
M	installing/installing_openstack/installing-openstack-user-kuryr.adoc
M	installing/installing_openstack/installing-openstack-user.adoc
M	installing/installing_rhv/installing-rhv-customizations.adoc
M	installing/installing_rhv/installing-rhv-default.adoc
M	installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
A	installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
A	installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
A	installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
M	installing/installing_vsphere/installing-vsphere.adoc
M	modules/admin-credentials-root-secret-formats.adoc
M	modules/cluster-entitlements.adoc
M	modules/installation-about-custom-azure-vnet.adoc
M	modules/installation-about-custom-gcp-vpc.adoc
M	modules/installation-about-restricted-network.adoc
M	modules/installation-aws-config-yaml.adoc
M	modules/installation-aws-permissions.adoc
M	modules/installation-aws-regions.adoc
M	modules/installation-aws-user-infra-requirements.adoc
M	modules/installation-azure-config-yaml.adoc
M	modules/installation-azure-create-ingress-dns-records.adoc
M	modules/installation-azure-regions.adoc
M	modules/installation-azure-service-principal.adoc
A	modules/installation-azure-user-defined-routing.adoc
M	modules/installation-azure-user-infra-deploying-rhcos.adoc
M	modules/installation-bare-metal-config-yaml.adoc
M	modules/installation-bootstrap-gather.adoc
M	modules/installation-common-issues.adoc
M	modules/installation-complete-user-infra.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-configure-proxy.adoc
M	modules/installation-create-ingress-dns-records.adoc
M	modules/installation-creating-aws-control-plane.adoc
M	modules/installation-creating-aws-dns.adoc
M	modules/installation-creating-aws-worker.adoc
M	modules/installation-creating-azure-bootstrap.adoc
M	modules/installation-creating-azure-control-plane.adoc
M	modules/installation-creating-azure-dns.adoc
M	modules/installation-creating-azure-vnet.adoc
M	modules/installation-creating-azure-worker.adoc
M	modules/installation-creating-gcp-worker.adoc
M	modules/installation-custom-aws-vpc.adoc
M	modules/installation-deployment-manager-worker.adoc
M	modules/installation-gcp-limits.adoc
A	modules/installation-gcp-user-infra-config-host-project-vpc.adoc
M	modules/installation-gcp-user-infra-rhcos.adoc
A	modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc
M	modules/installation-generate-aws-user-infra-install-config.adoc
M	modules/installation-generate-ignition-configs.adoc
M	modules/installation-ibm-z-user-infra-machines-iso.adoc
M	modules/installation-initializing.adoc
M	modules/installation-installing-bare-metal.adoc
M	modules/installation-launching-installer.adoc
M	modules/installation-network-user-infra.adoc
M	modules/installation-osp-converting-ignition-resources.adoc
M	modules/installation-osp-creating-control-plane.adoc
M	modules/installation-osp-creating-image.adoc
M	modules/installation-osp-downloading-modules.adoc
M	modules/installation-osp-enabling-swift.adoc
M	modules/installation-osp-kuryr-increase-quota.adoc
M	modules/installation-osp-kuryr-known-limitations.adoc
M	modules/installation-osp-kuryr-octavia-configuration.adoc
M	modules/installation-osp-verifying-cluster-status.adoc
M	modules/installation-osp-verifying-external-network.adoc
M	modules/installation-registry-storage-config.adoc
M	modules/installation-registry-storage-non-production.adoc
M	modules/installation-restricted-network-samples.adoc
A	modules/installation-rhv-about-inventory-yml.adoc
A	modules/installation-rhv-building-ignition-files.adoc
A	modules/installation-rhv-creating-bootstrap-machine.adoc
A	modules/installation-rhv-creating-install-config-file.adoc
A	modules/installation-rhv-creating-templates-virtual-machines.adoc
A	modules/installation-rhv-customizing-install-config-yaml.adoc
A	modules/installation-rhv-editing-manifests.adoc
A	modules/installation-rhv-making-control-plane-nodes-non-schedulable.adoc
A	modules/installation-rhv-removing-cluster-upi.adoc
A	modules/installation-rhv-specifying-rhcos-image-settings.adoc
M	modules/installation-special-config-crony.adoc
M	modules/installation-special-config-encrypt-disk-tang.adoc
M	modules/installation-special-config-kargs.adoc
M	modules/installation-special-config-kmod.adoc
M	modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
A	modules/installation-user-infra-machines-advanced.adoc
M	modules/installation-user-infra-machines-iso.adoc
M	modules/installation-user-infra-machines-pxe.adoc
A	modules/installation-vsphere-installer-infra-requirements.adoc
M	modules/installation-vsphere-machines.adoc
A	modules/installing-rhv-accessing-ocp-web-console.adoc
A	modules/installing-rhv-network-infrastructure-configuration-upi.adoc
A	modules/installing-rhv-preparing-network-environment.adoc
A	modules/installing-rhv-setting-up-installation-machine.adoc
M	modules/ipi-install-additional-install-config-parameters.adoc
A	modules/ipi-install-bmc-addressing.adoc
M	modules/ipi-install-configuring-nodes.adoc
M	modules/ipi-install-creating-a-disconnected-registry.adoc
M	modules/ipi-install-creating-an-rhcos-images-cache.adoc
A	modules/ipi-install-ipv6-network-requirements.adoc
M	modules/ipi-install-network-requirements.adoc
M	modules/ipi-install-node-requirements.adoc
A	modules/ipi-install-root-device-hints.adoc
M	modules/ipi-install-troubleshooting-bootstrap-vm.adoc
M	modules/ipi-install-troubleshooting-install-config.adoc
M	modules/ipi-install-troubleshooting-misc-issues.adoc
M	modules/ipi-install-troubleshooting-ntp-out-of-sync.adoc
M	modules/ipi-install-validation-checklist-for-nodes.adoc
M	modules/manually-create-identity-access-management.adoc
M	modules/manually-gathering-logs-with-ssh.adoc
M	modules/manually-maintained-credentials-upgrade.adoc
A	modules/nw-endpoint-route53.adoc
M	modules/nw-install-config-parameters.adoc
M	modules/nw-operator-cr.adoc
M	modules/private-clusters-about-aws.adoc
M	modules/private-clusters-about-azure.adoc
M	modules/private-clusters-default.adoc
M	modules/private-clusters-setting-api-private.adoc
M	modules/private-clusters-setting-dns-private.adoc
M	modules/registry-configuring-storage-baremetal.adoc
M	modules/registry-configuring-storage-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/registry-configuring-storage-vsphere.adoc
Auto-merging modules/registry-configuring-storage-baremetal.adoc
Auto-merging modules/private-clusters-setting-dns-private.adoc
Auto-merging modules/private-clusters-setting-api-private.adoc
Auto-merging modules/private-clusters-default.adoc
CONFLICT (content): Merge conflict in modules/private-clusters-default.adoc
Auto-merging modules/private-clusters-about-azure.adoc
Auto-merging modules/private-clusters-about-aws.adoc
Auto-merging modules/nw-operator-cr.adoc
Auto-merging modules/nw-install-config-parameters.adoc
CONFLICT (modify/delete): modules/nw-endpoint-route53.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/nw-endpoint-route53.adoc left in tree.
Auto-merging modules/manually-maintained-credentials-upgrade.adoc
CONFLICT (content): Merge conflict in modules/manually-maintained-credentials-upgrade.adoc
Auto-merging modules/manually-gathering-logs-with-ssh.adoc
Auto-merging modules/manually-create-identity-access-management.adoc
CONFLICT (content): Merge conflict in modules/manually-create-identity-access-management.adoc
Auto-merging modules/ipi-install-validation-checklist-for-nodes.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-validation-checklist-for-nodes.adoc
Auto-merging modules/ipi-install-troubleshooting-ntp-out-of-sync.adoc
Auto-merging modules/ipi-install-troubleshooting-misc-issues.adoc
Auto-merging modules/ipi-install-troubleshooting-install-config.adoc
Auto-merging modules/ipi-install-troubleshooting-bootstrap-vm.adoc
CONFLICT (modify/delete): modules/ipi-install-root-device-hints.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/ipi-install-root-device-hints.adoc left in tree.
Auto-merging modules/ipi-install-node-requirements.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-node-requirements.adoc
Auto-merging modules/ipi-install-network-requirements.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-network-requirements.adoc
CONFLICT (modify/delete): modules/ipi-install-ipv6-network-requirements.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/ipi-install-ipv6-network-requirements.adoc left in tree.
Auto-merging modules/ipi-install-creating-an-rhcos-images-cache.adoc
Auto-merging modules/ipi-install-creating-a-disconnected-registry.adoc
Auto-merging modules/ipi-install-configuring-nodes.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-configuring-nodes.adoc
CONFLICT (modify/delete): modules/ipi-install-bmc-addressing.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/ipi-install-bmc-addressing.adoc left in tree.
Auto-merging modules/ipi-install-additional-install-config-parameters.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-additional-install-config-parameters.adoc
CONFLICT (modify/delete): modules/installing-rhv-setting-up-installation-machine.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installing-rhv-setting-up-installation-machine.adoc left in tree.
Auto-merging modules/installing-rhv-preparing-the-network-environment.adoc
CONFLICT (modify/delete): modules/installing-rhv-network-infrastructure-configuration-upi.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installing-rhv-network-infrastructure-configuration-upi.adoc left in tree.
Auto-merging modules/installing-rhv-accessing-the-ocp-web-console.adoc
Auto-merging modules/installation-vsphere-machines.adoc
CONFLICT (modify/delete): modules/installation-vsphere-installer-infra-requirements.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-vsphere-installer-infra-requirements.adoc left in tree.
Auto-merging modules/installation-user-infra-machines-pxe.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-pxe.adoc
Auto-merging modules/installation-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-iso.adoc
CONFLICT (modify/delete): modules/installation-user-infra-machines-advanced.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-user-infra-machines-advanced.adoc left in tree.
Auto-merging modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
Auto-merging modules/installation-special-config-kmod.adoc
CONFLICT (content): Merge conflict in modules/installation-special-config-kmod.adoc
Auto-merging modules/installation-special-config-kargs.adoc
Auto-merging modules/installation-special-config-encrypt-disk-tang.adoc
CONFLICT (content): Merge conflict in modules/installation-special-config-encrypt-disk-tang.adoc
Auto-merging modules/installation-special-config-crony.adoc
CONFLICT (modify/delete): modules/installation-rhv-specifying-rhcos-image-settings.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-specifying-rhcos-image-settings.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-removing-cluster-upi.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-removing-cluster-upi.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-making-control-plane-nodes-non-schedulable.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-making-control-plane-nodes-non-schedulable.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-editing-manifests.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-editing-manifests.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-customizing-install-config-yaml.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-customizing-install-config-yaml.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-creating-templates-virtual-machines.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-creating-templates-virtual-machines.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-creating-install-config-file.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-creating-install-config-file.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-creating-bootstrap-machine.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-creating-bootstrap-machine.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-building-ignition-files.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-building-ignition-files.adoc left in tree.
CONFLICT (modify/delete): modules/installation-rhv-about-inventory-yml.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-rhv-about-inventory-yml.adoc left in tree.
Auto-merging modules/installation-restricted-network-samples.adoc
CONFLICT (content): Merge conflict in modules/installation-restricted-network-samples.adoc
Auto-merging modules/installation-registry-storage-non-production.adoc
Auto-merging modules/installation-registry-storage-config.adoc
Auto-merging modules/installation-osp-verifying-external-network.adoc
Auto-merging modules/installation-osp-verifying-cluster-status.adoc
Auto-merging modules/installation-osp-kuryr-octavia-configuration.adoc
Auto-merging modules/installation-osp-kuryr-known-limitations.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-kuryr-known-limitations.adoc
Auto-merging modules/installation-osp-kuryr-increase-quota.adoc
Auto-merging modules/installation-osp-enabling-swift.adoc
Auto-merging modules/installation-osp-downloading-modules.adoc
Auto-merging modules/installation-osp-creating-image.adoc
Auto-merging modules/installation-osp-creating-control-plane.adoc
Auto-merging modules/installation-osp-converting-ignition-resources.adoc
Auto-merging modules/installation-network-user-infra.adoc
Auto-merging modules/installation-launching-installer.adoc
Auto-merging modules/installation-installing-bare-metal.adoc
Auto-merging modules/installation-initializing.adoc
Auto-merging modules/installation-ibm-z-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-ibm-z-user-infra-machines-iso.adoc
Auto-merging modules/installation-generate-ignition-configs.adoc
Auto-merging modules/installation-generate-aws-user-infra-install-config.adoc
CONFLICT (modify/delete): modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc left in tree.
Auto-merging modules/installation-gcp-user-infra-rhcos.adoc
CONFLICT (modify/delete): modules/installation-gcp-user-infra-config-host-project-vpc.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-gcp-user-infra-config-host-project-vpc.adoc left in tree.
Auto-merging modules/installation-gcp-limits.adoc
Auto-merging modules/installation-deployment-manager-worker.adoc
Auto-merging modules/installation-custom-aws-vpc.adoc
Auto-merging modules/installation-creating-gcp-worker.adoc
Auto-merging modules/installation-creating-azure-worker.adoc
Auto-merging modules/installation-creating-azure-vnet.adoc
Auto-merging modules/installation-creating-azure-dns.adoc
Auto-merging modules/installation-creating-azure-control-plane.adoc
CONFLICT (content): Merge conflict in modules/installation-creating-azure-control-plane.adoc
Auto-merging modules/installation-creating-azure-bootstrap.adoc
Auto-merging modules/installation-creating-aws-worker.adoc
Auto-merging modules/installation-creating-aws-dns.adoc
Auto-merging modules/installation-creating-aws-control-plane.adoc
Auto-merging modules/installation-create-ingress-dns-records.adoc
CONFLICT (content): Merge conflict in modules/installation-create-ingress-dns-records.adoc
Auto-merging modules/installation-configure-proxy.adoc
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.adoc
Auto-merging modules/installation-complete-user-infra.adoc
Auto-merging modules/installation-common-issues.adoc
CONFLICT (content): Merge conflict in modules/installation-common-issues.adoc
Auto-merging modules/installation-bootstrap-gather.adoc
Auto-merging modules/installation-bare-metal-config-yaml.adoc
Auto-merging modules/installation-azure-user-infra-deploying-rhcos.adoc
CONFLICT (modify/delete): modules/installation-azure-user-defined-routing.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of modules/installation-azure-user-defined-routing.adoc left in tree.
Auto-merging modules/installation-azure-service-principal.adoc
Auto-merging modules/installation-azure-regions.adoc
CONFLICT (content): Merge conflict in modules/installation-azure-regions.adoc
Auto-merging modules/installation-azure-create-ingress-dns-records.adoc
Auto-merging modules/installation-azure-config-yaml.adoc
CONFLICT (content): Merge conflict in modules/installation-azure-config-yaml.adoc
Auto-merging modules/installation-aws-user-infra-requirements.adoc
Auto-merging modules/installation-aws-regions.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-regions.adoc
Auto-merging modules/installation-aws-permissions.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-permissions.adoc
Auto-merging modules/installation-aws-config-yaml.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-config-yaml.adoc
Auto-merging modules/installation-about-restricted-network.adoc
Auto-merging modules/installation-about-custom-gcp-vpc.adoc
Auto-merging modules/installation-about-custom-azure-vnet.adoc
Auto-merging modules/cluster-entitlements.adoc
Auto-merging modules/admin-credentials-root-secret-formats.adoc
Auto-merging installing/installing_vsphere/installing-vsphere.adoc
CONFLICT (modify/delete): installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc deleted in HEAD and modified in Installation terminology updates. Version Installation terminology updates of installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc left in tree.
Auto-merging installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
Auto-merging installing/installing_rhv/installing-rhv-default.adoc
CONFLICT (content): Merge conflict in installing/installing_rhv/installing-rhv-default.adoc
Auto-merging installing/installing_rhv/installing-rhv-customizations.adoc
Auto-merging installing/installing_openstack/installing-openstack-user.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user.adoc
Auto-merging installing/installing_openstack/installing-openstack-user-kuryr.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user-kuryr.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
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/installing-ibm-z.adoc
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_power/installing-ibm-power.adoc
Auto-merging installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc
Auto-merging installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc
Auto-merging installing/installing_aws/installing-restricted-networks-aws.adoc
Auto-merging installing/installing_aws/installing-aws-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-network-customizations.adoc
Auto-merging installing/install_config/installing-customizing.adoc
Auto-merging installing/install_config/customizations.adoc
CONFLICT (content): Merge conflict in installing/install_config/customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Installation terminology updates
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.4

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.

@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 4, 2020

Cherrypicks for 4.6/4.7 are complete.

4.4/4.5 will require a little more effort. Those are in-progress.

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

Labels

branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants