Skip to content

Conversation

@eromanova97
Copy link
Contributor

@eromanova97 eromanova97 commented Nov 24, 2025

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

ocpdocs-previewbot commented Nov 24, 2025

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 25, 2025
@eromanova97 eromanova97 force-pushed the OBSDOCS-2848 branch 2 times, most recently from 3ffce82 to 0daabcf Compare November 25, 2025 09:00
@eromanova97
Copy link
Contributor Author

Note: the current conflict showing is due to another PR I just merged, the conflict is just with the xref, no changes in the PR will be affected. I will rebase after the peer review is done to not disrupt the review process.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2025
Copy link
Contributor

@max-cx max-cx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Peer review:

LGTM

plus a few suggestions to consider

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2025
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 25, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 25, 2025

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

@eromanova97 eromanova97 merged commit d3ff9f1 into openshift:monitoring-docs-main Nov 26, 2025
2 checks passed
@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.21

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.20

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.19

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.18

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.17

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.16

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.15

@openshift-cherrypick-robot

@eromanova97: new pull request created: #103069

In response to this:

/cherrypick monitoring-docs-4.21

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

@eromanova97: new pull request created: #103070

In response to this:

/cherrypick monitoring-docs-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

@eromanova97: new pull request created: #103071

In response to this:

/cherrypick monitoring-docs-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

@eromanova97: #102948 failed to apply on top of branch "monitoring-docs-4.18":

Applying: OBSDOCS-2848 Fix titles and short descriptions in monitoring support section
Using index info to reconstruct a base tree...
M	modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
M	support-for-monitoring/maintenance-and-support-for-monitoring.adoc
Falling back to patching base and 3-way merge...
Auto-merging support-for-monitoring/support-for-monitoring.adoc
Auto-merging modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
CONFLICT (content): Merge conflict in modules/monitoring-cluster-monitoring-operator-configuration-reference.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-2848 Fix titles and short descriptions in monitoring support section

In response to this:

/cherrypick monitoring-docs-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.

@openshift-cherrypick-robot

@eromanova97: #102948 failed to apply on top of branch "monitoring-docs-4.17":

Applying: OBSDOCS-2848 Fix titles and short descriptions in monitoring support section
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
M	support-for-monitoring/maintenance-and-support-for-monitoring.adoc
Falling back to patching base and 3-way merge...
Auto-merging support-for-monitoring/support-for-monitoring.adoc
Auto-merging modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
CONFLICT (content): Merge conflict in modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
Auto-merging _topic_maps/_topic_map.yml
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-2848 Fix titles and short descriptions in monitoring support section

In response to this:

/cherrypick monitoring-docs-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.

@openshift-cherrypick-robot

@eromanova97: #102948 failed to apply on top of branch "monitoring-docs-4.16":

Applying: OBSDOCS-2848 Fix titles and short descriptions in monitoring support section
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
M	support-for-monitoring/maintenance-and-support-for-monitoring.adoc
Falling back to patching base and 3-way merge...
Auto-merging support-for-monitoring/support-for-monitoring.adoc
Auto-merging modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
CONFLICT (content): Merge conflict in modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
Auto-merging _topic_maps/_topic_map.yml
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-2848 Fix titles and short descriptions in monitoring support section

In response to this:

/cherrypick monitoring-docs-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.

@openshift-cherrypick-robot

@eromanova97: #102948 failed to apply on top of branch "monitoring-docs-4.15":

Applying: OBSDOCS-2848 Fix titles and short descriptions in monitoring support section
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
M	support-for-monitoring/maintenance-and-support-for-monitoring.adoc
Falling back to patching base and 3-way merge...
Auto-merging support-for-monitoring/support-for-monitoring.adoc
Auto-merging modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
CONFLICT (content): Merge conflict in modules/monitoring-cluster-monitoring-operator-configuration-reference.adoc
Auto-merging _topic_maps/_topic_map.yml
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-2848 Fix titles and short descriptions in monitoring support section

In response to this:

/cherrypick monitoring-docs-4.15

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.

5 participants