Skip to content

OBSDOCS-2437: Implement Upgrading guide feedback #99389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 23, 2025
Merged

OBSDOCS-2437: Implement Upgrading guide feedback #99389

merged 1 commit into from
Sep 23, 2025

Conversation

@theashiot
Copy link
Contributor

@theashiot theashiot commented Sep 19, 2025 •
edited
Loading

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-2437

Link to docs preview: https://99389--ocpdocs-pr.netlify.app/openshift-logging/latest/upgrading/upgrading-to-logging-60.html

QE review: NA just editorial changes

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 19, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 19, 2025 •
edited by openshift-ci bot
Loading

@theashiot: This pull request references OBSDOCS-2437 which is a valid jira issue.

In response to this:

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-2437

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 19, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 19, 2025 •
edited
Loading

🤖 Tue Sep 23 10:57:03 - Prow CI generated the docs preview:

https://99389--ocpdocs-pr.netlify.app/openshift-logging/latest/upgrading/upgrading-to-logging-60.html

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 19, 2025 •
edited by openshift-ci bot
Loading

@theashiot: This pull request references OBSDOCS-2437 which is a valid jira issue.

In response to this:

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-2437

Link to docs preview: https://99389--ocpdocs-pr.netlify.app/openshift-logging/latest/upgrading/upgrading-to-logging-60.html

QE review:

  • QE has approved this change.

Additional information:

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.

eromanova97
eromanova97 reviewed Sep 22, 2025
View reviewed changes
Copy link
Contributor

@eromanova97 eromanova97 left a comment

Choose a reason for hiding this comment

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

Hello, I have finished my review with just a few small comments, and one out of scope suggestion. Thank you!

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 23, 2025 •
edited by openshift-ci bot
Loading

@theashiot: This pull request references OBSDOCS-2437 which is a valid jira issue.

In response to this:

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-2437

Link to docs preview: https://99389--ocpdocs-pr.netlify.app/openshift-logging/latest/upgrading/upgrading-to-logging-60.html

QE review: NA just editorial changes

Additional information:

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.

@theashiot
Copy link
Contributor Author

theashiot commented Sep 23, 2025

Thanks, @eromanova97 for the review! I've made the required changes.

best,
ashwin

@openshift-ci
Copy link

openshift-ci bot commented Sep 23, 2025

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

@briandooley briandooley merged commit 5616bef into openshift:standalone-logging-docs-main Sep 23, 2025
2 checks passed
@briandooley
Copy link
Contributor

briandooley commented Sep 23, 2025

/cherrypick standalone-logging-docs-6.0

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 23, 2025

@briandooley: #99389 failed to apply on top of branch "standalone-logging-docs-6.0":

Applying: OBSDOCS-2437: Implement Upgrading guide feedback
Using index info to reconstruct a base tree...
M	upgrading/docinfo.xml
Falling back to patching base and 3-way merge...
Auto-merging upgrading/docinfo.xml
CONFLICT (content): Merge conflict in upgrading/docinfo.xml
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-2437: Implement Upgrading guide feedback

In response to this:

/cherrypick standalone-logging-docs-6.0

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.

@briandooley
Copy link
Contributor

briandooley commented Sep 23, 2025

/cherrypick standalone-logging-docs-6.1

@briandooley
Copy link
Contributor

briandooley commented Sep 23, 2025

/cherrypick standalone-logging-docs-6.2

@briandooley
Copy link
Contributor

briandooley commented Sep 23, 2025

/cherrypick standalone-logging-docs-6.3

@briandooley
Copy link
Contributor

briandooley commented Sep 23, 2025

/cherrypick standalone-logging-docs-6.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 23, 2025

@briandooley: new pull request created: #99549

In response to this:

/cherrypick standalone-logging-docs-6.1

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 openshift-cherrypick-robot mentioned this pull request Sep 23, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 23, 2025

@briandooley: new pull request created: #99550

In response to this:

/cherrypick standalone-logging-docs-6.2

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 openshift-cherrypick-robot mentioned this pull request Sep 23, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 23, 2025

@briandooley: new pull request created: #99551

In response to this:

/cherrypick standalone-logging-docs-6.3

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 openshift-cherrypick-robot mentioned this pull request Sep 23, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 23, 2025

@briandooley: new pull request created: #99552

In response to this:

/cherrypick standalone-logging-docs-6.4

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 openshift-cherrypick-robot mentioned this pull request Sep 23, 2025
Merged
@theashiot theashiot mentioned this pull request Sep 23, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eromanova97 eromanova97 eromanova97 left review comments

Assignees

No one assigned

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@theashiot @openshift-ci-robot @ocpdocs-previewbot @briandooley @openshift-cherrypick-robot @eromanova97