Skip to content

[enterprise-4.18] DOCPLAN-86: Update for DITA vale#107190

Merged
abrennan89 merged 1 commit intoopenshift:enterprise-4.18from
openshift-cherrypick-robot:cherry-pick-107189-to-enterprise-4.18
Feb 24, 2026
Merged

[enterprise-4.18] DOCPLAN-86: Update for DITA vale#107190
abrennan89 merged 1 commit intoopenshift:enterprise-4.18from
openshift-cherrypick-robot:cherry-pick-107189-to-enterprise-4.18

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Feb 24, 2026

This is an automated cherry-pick of #107189

xref: #107068

/assign abrennan89

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2026

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: DOCPLAN-86

Details

In response to this:

This is an automated cherry-pick of #107189

/assign abrennan89

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 24, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 24, 2026

@openshift-cherrypick-robot: 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-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 24, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2026

@openshift-cherrypick-robot: This pull request references DOCPLAN-86 which is a valid jira issue.

Details

In response to this:

This is an automated cherry-pick of #107189

xref: #107068

/assign abrennan89

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

/cherrypick enterprise-4.17

@openshift-cherrypick-robot
Copy link
Author

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

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.

@abrennan89 abrennan89 merged commit 9891e7f into openshift:enterprise-4.18 Feb 24, 2026
2 checks passed
@openshift-cherrypick-robot
Copy link
Author

@abrennan89: #107190 failed to apply on top of branch "enterprise-4.17":

Applying: DOCPLAN-86: Update for DITA vale
Using index info to reconstruct a base tree...
A	virt/managing_vms/virt-accessing-vm-ssh.adoc
M	virt/vm_networking/virt-hot-plugging-network-interfaces.adoc
M	virt/vm_networking/virt-networking-overview.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/vm_networking/virt-networking-overview.adoc
CONFLICT (content): Merge conflict in virt/vm_networking/virt-networking-overview.adoc
Auto-merging virt/vm_networking/virt-hot-plugging-network-interfaces.adoc
CONFLICT (content): Merge conflict in virt/vm_networking/virt-hot-plugging-network-interfaces.adoc
Auto-merging virt/virtual_machines/virt-accessing-vm-ssh.adoc
CONFLICT (content): Merge conflict in virt/virtual_machines/virt-accessing-vm-ssh.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 DOCPLAN-86: Update for DITA vale

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.

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants