Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #99183

/assign eromanova97

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 17, 2025

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: OBSDOCS-2299

In response to this:

This is an automated cherry-pick of #99183

/assign eromanova97

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/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 17, 2025
@openshift-ci
Copy link

openshift-ci bot commented Sep 17, 2025

@openshift-cherrypick-robot: 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 825802b into openshift:monitoring-docs-main Sep 17, 2025
2 checks passed
@eromanova97
Copy link
Contributor

/cherrypick monitoring-docs-4.20

@eromanova97
Copy link
Contributor

/cherrypick monitoring-docs-4.19

@eromanova97
Copy link
Contributor

/cherrypick monitoring-docs-4.18

@openshift-cherrypick-robot
Copy link
Author

@eromanova97: new pull request created: #99201

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

@eromanova97: new pull request created: #99202

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

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

Applying: OBSDOCS-2299: doc mismatches dev console
Using index info to reconstruct a base tree...
M	modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-admin.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-2299: doc mismatches dev console

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.

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