Skip to content

Conversation

@shdeshpa07
Copy link
Contributor

Jira

This PR is for changes found by running the ASCIIDocDITA vale package for the OADP API doc set.

This PR has structural changes only. No technical changes have been made.

Preview

Version

  • OCP 4.19, 4.20

QE Review

By-passing QE review for this PR as the changes are structural only.

Signed-off-by: Shruti Deshpande <shdeshpa@redhat.com>
@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 29, 2025
@ocpdocs-previewbot
Copy link

@openshift-ci
Copy link

openshift-ci bot commented Aug 29, 2025

@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
Copy link
Contributor Author

/label OADP

@openshift-ci openshift-ci bot added the OADP Label for all OADP PRs label Aug 29, 2025
@shdeshpa07
Copy link
Contributor Author

@anarnold97 - Can I request your review for this DITA-vale PR please? Thanks.

@shdeshpa07 shdeshpa07 added this to the Continuous Release milestone Sep 4, 2025
@shdeshpa07 shdeshpa07 merged commit bfe5dbb into openshift:main Sep 4, 2025
2 checks passed
@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.20

@shdeshpa07
Copy link
Contributor Author

/cherrypick enterprise-4.19

@openshift-cherrypick-robot

@shdeshpa07: new pull request created: #98496

In response to this:

/cherrypick enterprise-4.20

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: #98246 failed to apply on top of branch "enterprise-4.19":

Applying: Dita vale fixes for OADP API
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/oadp-api.adoc
A	modules/applicationconfig-type.adoc
A	modules/backuplocation-type.adoc
A	modules/customplugin-type.adoc
A	modules/datamover-type.adoc
A	modules/dataprotectionapplicationspec-type.adoc
A	modules/features-type.adoc
A	modules/podconfig-type.adoc
A	modules/resticconfig-type.adoc
A	modules/snapshotlocation-type.adoc
A	modules/veleroconfig-type.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/veleroconfig-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/veleroconfig-type.adoc left in tree.
CONFLICT (modify/delete): modules/snapshotlocation-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/snapshotlocation-type.adoc left in tree.
CONFLICT (modify/delete): modules/resticconfig-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/resticconfig-type.adoc left in tree.
CONFLICT (modify/delete): modules/podconfig-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/podconfig-type.adoc left in tree.
CONFLICT (modify/delete): modules/features-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/features-type.adoc left in tree.
CONFLICT (modify/delete): modules/dataprotectionapplicationspec-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/dataprotectionapplicationspec-type.adoc left in tree.
CONFLICT (modify/delete): modules/datamover-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/datamover-type.adoc left in tree.
CONFLICT (modify/delete): modules/customplugin-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/customplugin-type.adoc left in tree.
CONFLICT (modify/delete): modules/backuplocation-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/backuplocation-type.adoc left in tree.
CONFLICT (modify/delete): modules/applicationconfig-type.adoc deleted in HEAD and modified in Dita vale fixes for OADP API. Version Dita vale fixes for OADP API of modules/applicationconfig-type.adoc left in tree.
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 fixes for OADP API

In response to this:

/cherrypick enterprise-4.19

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
Copy link
Contributor Author

CP for 4.18

#100507 xref: 1c5cffe

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

Labels

branch/enterprise-4.19 branch/enterprise-4.20 OADP Label for all OADP PRs size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants