Skip to content

OBSDOCS-2564 Fix logging docs xrefs to COO#100500

Merged
gabriel-rh merged 1 commit intoopenshift:mainfrom
gabriel-rh:OBSDOCS-2564
Oct 15, 2025
Merged

OBSDOCS-2564 Fix logging docs xrefs to COO#100500
gabriel-rh merged 1 commit intoopenshift:mainfrom
gabriel-rh:OBSDOCS-2564

Conversation

@gabriel-rh
Copy link
Contributor

@gabriel-rh gabriel-rh commented Oct 15, 2025

Version(s):
4.12+ maybe - depends on whether the context exists on older versions

Issue:
OBSDOCS-2564

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 15, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 15, 2025

🤖 Wed Oct 15 10:43:22 - Prow CI generated the docs preview:

https://100500--ocpdocs-pr.netlify.app/

@gabriel-rh gabriel-rh force-pushed the OBSDOCS-2564 branch 5 times, most recently from c77be96 to f6431c8 Compare October 15, 2025 10:17
@openshift-ci
Copy link

openshift-ci bot commented Oct 15, 2025

@gabriel-rh: 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.

@gabriel-rh gabriel-rh merged commit b337fe7 into openshift:main Oct 15, 2025
2 checks passed
@gabriel-rh
Copy link
Contributor Author

/cherrypick enterprise-4.20

@gabriel-rh
Copy link
Contributor Author

/cherrypick enterprise-4.19

@gabriel-rh
Copy link
Contributor Author

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@gabriel-rh: new pull request created: #100505

Details

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

@gabriel-rh: new pull request created: #100506

Details

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.

@openshift-cherrypick-robot

@gabriel-rh: #100500 failed to apply on top of branch "enterprise-4.18":

Applying: OBSDOCS-2564 Fix logging docs xrefs to COO
Using index info to reconstruct a base tree...
M	observability/logging/logging-6.0/log6x-visual.adoc
M	observability/logging/logging-6.1/log6x-visual-6.1.adoc
M	observability/logging/logging-6.2/log6x-visual-6.2.adoc
M	snippets/logging-support-exception-for-cluster-observability-operator-due-to-logging-ui-plugin.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/logging-support-exception-for-cluster-observability-operator-due-to-logging-ui-plugin.adoc
CONFLICT (content): Merge conflict in snippets/logging-support-exception-for-cluster-observability-operator-due-to-logging-ui-plugin.adoc
Auto-merging observability/logging/logging-6.2/log6x-visual-6.2.adoc
CONFLICT (content): Merge conflict in observability/logging/logging-6.2/log6x-visual-6.2.adoc
Auto-merging observability/logging/logging-6.1/log6x-visual-6.1.adoc
CONFLICT (content): Merge conflict in observability/logging/logging-6.1/log6x-visual-6.1.adoc
Auto-merging observability/logging/logging-6.0/log6x-visual.adoc
CONFLICT (content): Merge conflict in observability/logging/logging-6.0/log6x-visual.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 OBSDOCS-2564 Fix logging docs xrefs to COO

Details

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.

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

Labels

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.

3 participants