[enterprise-4.14] CNV-74970: Update callouts for DITA

[abrennan89]

Manual cherrypick of 2ec4b19 xref: #106899

[openshift-ci-robot]

@abrennan89: This pull request references CNV-74970 which is a valid jira issue.

Details

In response to this:

Manual cherrypick of 2ec4b19 xref: #106899

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 openshift-eng/jira-lifecycle-plugin repository.

[abrennan89]

/cherrypick enterprise-4.12

[openshift-cherrypick-robot]

@abrennan89: once the present PR merges, I will cherry-pick it on top of enterprise-4.12 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-4.12

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.

[ocpdocs-previewbot]

🤖 Thu Feb 26 21:33:10 - Prow CI generated the docs preview:

https://107569--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/storage/virt-automatic-bootsource-updates.html
https://107569--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/virtual_machines/advanced_vm_management/virt-configuring-pci-passthrough.html
https://107569--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/virtual_machines/advanced_vm_management/virt-configuring-virtual-gpus.html
https://107569--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/vm_networking/virt-connecting-vm-to-sriov.html
https://107569--ocpdocs-pr.netlify.app/openshift-enterprise/latest/web_console/dynamic-plugin/dynamic-plugins-get-started.html

[openshift-ci]

@abrennan89: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-cherrypick-robot]

@abrennan89: #107569 failed to apply on top of branch "enterprise-4.12":

Applying: CNV-74970: Update callouts for DITA
Using index info to reconstruct a base tree...
M	modules/virt-adding-kernel-arguments-enable-iommu.adoc
M	modules/virt-attaching-vm-to-sriov-network.adoc
M	modules/virt-autoupdate-custom-bootsource.adoc
M	modules/virt-binding-devices-vfio-driver.adoc
M	modules/virt-configuring-storage-class-bootsource-update.adoc
A	modules/virt-preventing-nvidia-gpu-operands-from-deploying-on-nodes.adoc
M	modules/virt-verify-status-bootsource-update.adoc
M	web_console/dynamic-plugin/dynamic-plugins-get-started.adoc
Falling back to patching base and 3-way merge...
Auto-merging web_console/dynamic-plugin/dynamic-plugins-get-started.adoc
Auto-merging modules/virt-verify-status-bootsource-update.adoc
CONFLICT (content): Merge conflict in modules/virt-verify-status-bootsource-update.adoc
CONFLICT (modify/delete): modules/virt-preventing-nvidia-gpu-operands-from-deploying-on-nodes.adoc deleted in HEAD and modified in CNV-74970: Update callouts for DITA. Version CNV-74970: Update callouts for DITA of modules/virt-preventing-nvidia-gpu-operands-from-deploying-on-nodes.adoc left in tree.
Auto-merging modules/virt-configuring-storage-class-bootsource-update.adoc
CONFLICT (content): Merge conflict in modules/virt-configuring-storage-class-bootsource-update.adoc
Auto-merging modules/virt-binding-devices-vfio-driver.adoc
Auto-merging modules/virt-autoupdate-custom-bootsource.adoc
CONFLICT (content): Merge conflict in modules/virt-autoupdate-custom-bootsource.adoc
Auto-merging modules/virt-attaching-vm-to-sriov-network.adoc
CONFLICT (content): Merge conflict in modules/virt-attaching-vm-to-sriov-network.adoc
Auto-merging modules/virt-adding-kernel-arguments-enable-iommu.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 set advice.mergeConflict false"
Patch failed at 0001 CNV-74970: Update callouts for DITA

Details

In response to this:

/cherrypick enterprise-4.12

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.