Skip to content

Comments

[enterprise-4.18]OSDOCS-16848#106801

Merged
JoeAldinger merged 1 commit intoopenshift:enterprise-4.18from
JoeAldinger:OSDOCS-16848-4.18
Feb 23, 2026
Merged

[enterprise-4.18]OSDOCS-16848#106801
JoeAldinger merged 1 commit intoopenshift:enterprise-4.18from
JoeAldinger:OSDOCS-16848-4.18

Conversation

@JoeAldinger
Copy link
Contributor

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@JoeAldinger
Copy link
Contributor Author

#106087
git commit: 4a21e0f

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 17, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 23, 2026

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

@JoeAldinger JoeAldinger changed the title Merge pull request #72011 from openshift-cherrypick-robot/cherry-pick… [enterprise-4.18]OSDOCS-16848 Feb 23, 2026
@JoeAldinger JoeAldinger merged commit 223d072 into openshift:enterprise-4.18 Feb 23, 2026
2 checks passed
@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@JoeAldinger: #106801 failed to apply on top of branch "enterprise-4.17":

Applying: NOP-7
Using index info to reconstruct a base tree...
M	modules/nw-controlling-dns-pod-placement.adoc
M	modules/nw-dns-view.adoc
M	networking/networking_operators/dns-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/networking_operators/dns-operator.adoc
Auto-merging modules/nw-dns-view.adoc
Auto-merging modules/nw-controlling-dns-pod-placement.adoc
CONFLICT (content): Merge conflict in modules/nw-controlling-dns-pod-placement.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 NOP-7

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

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.

4 participants