Skip to content

Conversation

@lpettyjo
Copy link
Contributor

@lpettyjo lpettyjo commented Aug 5, 2025

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 5, 2025
@lpettyjo lpettyjo added this to the Continuous Release milestone Aug 5, 2025
@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 5, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 5, 2025

🤖 Wed Aug 20 18:50:17 - Prow CI generated the docs preview:
https://97182--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@gcharot
Copy link

gcharot commented Aug 6, 2025

Thanks for working on it!
Would it possible to have a pre-merge preview link?

@lpettyjo
Copy link
Contributor Author

lpettyjo commented Aug 6, 2025

This link is in the first comment now.

@gcharot
Copy link

gcharot commented Aug 6, 2025

The preview renders with the old style (that we all love) but it's in the top level of the storage section now so i assume it will be reflected the same way on docs.redhat.com?

@lpettyjo lpettyjo force-pushed the OSDOCS-14022 branch 2 times, most recently from 748b5fa to 2a4a95f Compare August 8, 2025 16:34
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 8, 2025
@lpettyjo lpettyjo force-pushed the OSDOCS-14022 branch 3 times, most recently from 2053f21 to a789457 Compare August 11, 2025 16:09
@gcharot
Copy link

gcharot commented Aug 12, 2025

LGTM

@lpettyjo
Copy link
Contributor Author

@gcharot It doesn't look like Daniel Fleischman is with the company anymore. Anyone else that should review/approve?

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 20, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 20, 2025
@openshift-ci
Copy link

openshift-ci bot commented Aug 20, 2025

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

Copy link

@DanielFroehlich DanielFroehlich left a comment

Choose a reason for hiding this comment

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

LGTM

@lpettyjo lpettyjo merged commit be2d649 into openshift:main Aug 27, 2025
2 checks passed
@lpettyjo
Copy link
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@lpettyjo: new pull request created: #98117

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.

@lpettyjo
Copy link
Contributor Author

/cherrypick enterprise-4.19

@openshift-cherrypick-robot

@lpettyjo: new pull request created: #98118

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.

@lpettyjo
Copy link
Contributor Author

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@lpettyjo: #97182 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-14022#Move local storage info up a level for visibility
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	scalability_and_performance/telco-hub-rds.adoc
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in storage/persistent_storage_local/snippets
CONFLICT (content): Merge conflict in storage/persistent_storage_local/modules
CONFLICT (content): Merge conflict in storage/persistent_storage_local/images
CONFLICT (content): Merge conflict in storage/persistent_storage_local/_attributes
Auto-merging scalability_and_performance/telco-hub-rds.adoc
CONFLICT (content): Merge conflict in scalability_and_performance/telco-hub-rds.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-bm.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 OSDOCS-14022#Move local storage info up a level for visibility

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants