openshift
[enterprise-4.19]OSDOCS-16989_2:updating CQAs
4.19 cherrypick of https://github.com/openshift/openshift-docs/commit/aebbead2b520d9846da82a2e7004d54a33622d4c Manual cherry pick of https://github.com/openshift/openshift-docs/pull/103257
🤖 Wed Dec 17 16:06:22 - Prow CI generated the docs preview: https://104069--ocpdocs-pr.netlify.app Complete list of updated preview URLs: artifacts/updated_preview_urls.txt
@brendan-daly-red-hat: all tests passed!
Full PR test history. Your PR dashboard.
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-sigs/prow repository. I understand the commands that are listed here.
![openshift-ci[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@stevsmit: new pull request created: #104141
In response to this:
/cherry-pick enterprise-4.18
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-sigs/prow repository.
@stevsmit: #104069 failed to apply on top of branch "enterprise-4.17":
Applying: OSDOCS-16989_2:updating CQAs
.git/rebase-apply/patch:921: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
M modules/installation-aws-permissions.adoc
M modules/installation-aws-regions.adoc
M modules/installation-uninstall-clouds.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-uninstall-clouds.adoc
CONFLICT (content): Merge conflict in modules/installation-uninstall-clouds.adoc
Auto-merging modules/installation-aws-regions.adoc
Auto-merging modules/installation-aws-permissions.adoc
Auto-merging installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-16989_2:updating CQAs
In response to this:
/cherry-pick enterprise-4.17
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-sigs/prow repository.
@stevsmit: #104069 failed to apply on top of branch "enterprise-4.16":
Applying: OSDOCS-16989_2:updating CQAs
.git/rebase-apply/patch:921: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
M modules/installation-aws-iam-policies-about.adoc
M modules/installation-aws-permissions.adoc
M modules/installation-aws-regions.adoc
M modules/installation-three-node-cluster-cloud-provider.adoc
M modules/installation-uninstall-clouds.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-uninstall-clouds.adoc
CONFLICT (content): Merge conflict in modules/installation-uninstall-clouds.adoc
Auto-merging modules/installation-three-node-cluster-cloud-provider.adoc
CONFLICT (content): Merge conflict in modules/installation-three-node-cluster-cloud-provider.adoc
Auto-merging modules/installation-aws-regions.adoc
Auto-merging modules/installation-aws-permissions.adoc
Auto-merging modules/installation-aws-iam-policies-about.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-iam-policies-about.adoc
Auto-merging installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-16989_2:updating CQAs
In response to this:
/cherry-pick enterprise-4.16
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-sigs/prow repository.