dita-vale-oadp-api-4.19

[shdeshpa07]

cherrypicked from ec44b78 xref: #98246

[ocpdocs-previewbot]

🤖 Thu Sep 04 11:56:31 - Prow CI generated the docs preview:

https://98499--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/oadp-api.html

[openshift-ci]

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

[shdeshpa07]

/cherrypick enterprise-4.18

[openshift-cherrypick-robot]

@shdeshpa07: #98499 failed to apply on top of branch "enterprise-4.18":

Applying: dita-vale-oadp-api-4.19
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/oadp-api.adoc
Falling back to patching base and 3-way merge...
Auto-merging backup_and_restore/application_backup_and_restore/oadp-api.adoc
CONFLICT (content): Merge conflict in backup_and_restore/application_backup_and_restore/oadp-api.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 dita-vale-oadp-api-4.19

In response to this:

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