4.18-cqa fixes for must gather

[shdeshpa07]

cherry picked from #107888 xref: 32e3d8d

[ocpdocs-previewbot]

🤖 Fri Mar 13 06:33:28 - Prow CI generated the docs preview:

https://108285--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.html

[openshift-ci]

@shdeshpa07: 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.

[shdeshpa07]

/cherrypick enterprise-4.17

[shdeshpa07]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@shdeshpa07: new pull request created: #108286

Details

In response to this:

/cherrypick 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.

[openshift-cherrypick-robot]

@shdeshpa07: new pull request created: #108287

Details

In response to this:

/cherrypick 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.

[shdeshpa07]

/cherrypick enterprise-4.15

[shdeshpa07]

/cherrypick enterprise-4.14

[openshift-cherrypick-robot]

@shdeshpa07: #108285 failed to apply on top of branch "enterprise-4.15":

Applying: cqa fixes for must gather
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
M	modules/using-must-gather.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-must-gather.adoc
CONFLICT (content): Merge conflict in modules/using-must-gather.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.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 cqa fixes for must gather

Details

In response to this:

/cherrypick enterprise-4.15

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.

[openshift-cherrypick-robot]

@shdeshpa07: #108285 failed to apply on top of branch "enterprise-4.14":

Applying: cqa fixes for must gather
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.adoc
M	modules/using-must-gather.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-must-gather.adoc
CONFLICT (content): Merge conflict in modules/using-must-gather.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/using-the-must-gather-tool.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 cqa fixes for must gather

Details

In response to this:

/cherrypick enterprise-4.14

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.