Skip to content

OLS Release Notes 1.1.2 further updates - #117406

Merged
briandooley merged 1 commit into
openshift:lightspeed-docs-mainfrom
pabel-rh:OLS-release-1.1.2-further-updates
Aug 7, 2026
Merged

OLS Release Notes 1.1.2 further updates#117406
briandooley merged 1 commit into
openshift:lightspeed-docs-mainfrom
pabel-rh:OLS-release-1.1.2-further-updates

Conversation

@pabel-rh

@pabel-rh pabel-rh commented Aug 6, 2026

Copy link
Copy Markdown

Version(s):
lightspeed-docs-main, lightspeed-docs-1.0, lightspeed-docs-1.1

Issue:
OBSDOCS-3549

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 6, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented Aug 6, 2026

Copy link
Copy Markdown

@openshift-ci openshift-ci Bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 7, 2026
Comment thread modules/ols-about-the-offline-knowledge-portal.adoc
Comment thread modules/ols-1-1-2-known-issues.adoc Outdated

@sriroopar sriroopar left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Please include all the discussed changes. Thank you!

@pabel-rh
pabel-rh force-pushed the OLS-release-1.1.2-further-updates branch from b135a3f to de58618 Compare August 7, 2026 05:38
@pabel-rh

pabel-rh commented Aug 7, 2026

Copy link
Copy Markdown
Author

Review is done through Google meet. So, we don't need to re-request for a review. We can proceed with the merge.

@pabel-rh
pabel-rh force-pushed the OLS-release-1.1.2-further-updates branch from 12b6407 to b820671 Compare August 7, 2026 08:56
@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown

@pabel-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.

@briandooley
briandooley merged commit 8754d4d into openshift:lightspeed-docs-main Aug 7, 2026
2 checks passed
@briandooley

Copy link
Copy Markdown
Contributor

/cherrypick lightspeed-docs-1.1

@briandooley

Copy link
Copy Markdown
Contributor

/cherrypick lightspeed-docs-1.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@briandooley: #117406 failed to apply on top of branch "lightspeed-docs-1.1":

Applying: OLS Release Notes 1.1.2 further updates
Using index info to reconstruct a base tree...
A	modules/ols-1-1-2-release-notes.adoc
A	modules/ols-about-the-offline-knowledge-portal.adoc
M	release_notes/ols-release-notes.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/ols-1-1-2-release-notes.adoc deleted in HEAD and modified in OLS Release Notes 1.1.2 further updates.  Version OLS Release Notes 1.1.2 further updates of modules/ols-1-1-2-release-notes.adoc left in tree.
CONFLICT (modify/delete): modules/ols-about-the-offline-knowledge-portal.adoc deleted in HEAD and modified in OLS Release Notes 1.1.2 further updates.  Version OLS Release Notes 1.1.2 further updates of modules/ols-about-the-offline-knowledge-portal.adoc left in tree.
Auto-merging release_notes/ols-release-notes.adoc
CONFLICT (content): Merge conflict in release_notes/ols-release-notes.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 OLS Release Notes 1.1.2 further updates

Details

In response to this:

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

Copy link
Copy Markdown

@briandooley: #117406 failed to apply on top of branch "lightspeed-docs-1.0":

Applying: OLS Release Notes 1.1.2 further updates
Using index info to reconstruct a base tree...
M	modules/ols-1-1-2-release-notes.adoc
M	release_notes/ols-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ols-1-1-2-release-notes.adoc
Auto-merging release_notes/ols-release-notes.adoc
CONFLICT (content): Merge conflict in release_notes/ols-release-notes.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 OLS Release Notes 1.1.2 further updates

Details

In response to this:

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

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