Skip to content

[enterprise-4.17] CNV-74970: Update callouts for DITA#107565

Merged
abrennan89 merged 1 commit intoopenshift:enterprise-4.17from
abrennan89:calloutsfix17
Feb 26, 2026
Merged

[enterprise-4.17] CNV-74970: Update callouts for DITA#107565
abrennan89 merged 1 commit intoopenshift:enterprise-4.17from
abrennan89:calloutsfix17

Conversation

@abrennan89
Copy link
Contributor

Manual cherrypick of 2ec4b19 xref: #106899

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 26, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 26, 2026

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

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 26, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 26, 2026

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

@abrennan89 abrennan89 merged commit 402a3cb into openshift:enterprise-4.17 Feb 26, 2026
2 checks passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@abrennan89: #107565 failed to apply on top of branch "enterprise-4.16":

Applying: CNV-74970: Update callouts for DITA
Using index info to reconstruct a base tree...
M	modules/virt-autoupdate-custom-bootsource.adoc
M	modules/virt-configuring-storage-class-bootsource-update.adoc
M	modules/virt-verify-status-bootsource-update.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-verify-status-bootsource-update.adoc
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-autoupdate-custom-bootsource.adoc
CONFLICT (content): Merge conflict in modules/virt-autoupdate-custom-bootsource.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.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.

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

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants