Skip to content

OSDOCS#16699: Adding missing mod-docs-content-types for assemblies fo… #101159

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
Oct 28, 2025
Merged

OSDOCS#16699: Adding missing mod-docs-content-types for assemblies fo… #101159

merged 1 commit into from
Oct 28, 2025

Conversation

@bergerhoffer
Copy link
Contributor

@bergerhoffer bergerhoffer commented Oct 28, 2025 •
edited
Loading

Version(s):
4.14+

Issue:
https://issues.redhat.com/browse/OSDOCS-16699

Link to docs preview:
No visible changes to preview

QE review:
No QE required - metadata change only

Additional information:

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 28, 2025
@bergerhoffer bergerhoffer added this to the Continuous Release milestone Oct 28, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 28, 2025

🤖 Tue Oct 28 14:12:06 - Prow CI generated the docs preview:

https://101159--ocpdocs-pr.netlify.app/
https://101159--ocpdocs-pr.netlify.app/openshift-dedicated/latest/authentication/index.html
https://101159--ocpdocs-pr.netlify.app/openshift-dedicated/latest/storage/container_storage_interface/persistent-storage-csi-google-cloud-file.html
https://101159--ocpdocs-pr.netlify.app/openshift-enterprise/latest/authentication/index.html
https://101159--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.html
https://101159--ocpdocs-pr.netlify.app/openshift-enterprise/latest/storage/container_storage_interface/persistent-storage-csi-azure-file.html
https://101159--ocpdocs-pr.netlify.app/openshift-enterprise/latest/storage/container_storage_interface/persistent-storage-csi-google-cloud-file.html
https://101159--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/authentication/index.html
https://101159--ocpdocs-pr.netlify.app/openshift-rosa/latest/authentication/index.html

@openshift-ci
Copy link

openshift-ci bot commented Oct 28, 2025

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

@bergerhoffer
Copy link
Contributor Author

bergerhoffer commented Oct 28, 2025

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 28, 2025
@bscott-rh bscott-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Oct 28, 2025
@bscott-rh bscott-rh added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Oct 28, 2025
@bscott-rh
Copy link
Contributor

bscott-rh commented Oct 28, 2025

Merge review LGTM (co-reviewed with @brendan-daly-red-hat)

@bergerhoffer bergerhoffer merged commit dd250be into openshift:main Oct 28, 2025
2 checks passed
@bergerhoffer
Copy link
Contributor Author

bergerhoffer commented Oct 28, 2025

/cherrypick enterprise-4.21

@bergerhoffer
Copy link
Contributor Author

bergerhoffer commented Oct 28, 2025

/cherrypick enterprise-4.20

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 28, 2025

@bergerhoffer: #101159 failed to apply on top of branch "enterprise-4.21":

Applying: OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP
.git/rebase-apply/patch:82: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
A	microshift_release_notes/microshift-4-12-release-notes.adoc
A	microshift_release_notes/microshift-4-13-release-notes.adoc
A	microshift_release_notes/microshift-4-14-release-notes.adoc
A	release_notes/ocp-4-1-release-notes.adoc
A	release_notes/ocp-4-10-release-notes.adoc
A	release_notes/ocp-4-11-release-notes.adoc
A	release_notes/ocp-4-12-release-notes.adoc
A	release_notes/ocp-4-13-release-notes.adoc
A	release_notes/ocp-4-14-release-notes.adoc
A	release_notes/ocp-4-2-release-notes.adoc
A	release_notes/ocp-4-3-release-notes.adoc
A	release_notes/ocp-4-4-release-notes.adoc
A	release_notes/ocp-4-5-release-notes.adoc
A	release_notes/ocp-4-6-release-notes.adoc
A	release_notes/ocp-4-7-release-notes.adoc
A	release_notes/ocp-4-8-release-notes.adoc
A	release_notes/ocp-4-9-release-notes.adoc
M	storage/container_storage_interface/persistent-storage-csi-azure-file.adoc
Falling back to patching base and 3-way merge...
Auto-merging storage/container_storage_interface/persistent-storage-csi-azure-file.adoc
CONFLICT (modify/delete): release_notes/ocp-4-9-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-9-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-8-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-8-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-7-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-7-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-6-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-6-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-5-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-5-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-4-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-4-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-3-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-3-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-2-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-2-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-14-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-14-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-13-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-13-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-12-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-12-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-11-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-11-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-10-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-10-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-1-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-1-release-notes.adoc left in tree.
CONFLICT (modify/delete): microshift_release_notes/microshift-4-14-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of microshift_release_notes/microshift-4-14-release-notes.adoc left in tree.
CONFLICT (modify/delete): microshift_release_notes/microshift-4-13-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of microshift_release_notes/microshift-4-13-release-notes.adoc left in tree.
CONFLICT (modify/delete): microshift_release_notes/microshift-4-12-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of microshift_release_notes/microshift-4-12-release-notes.adoc left in tree.
Auto-merging installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.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 OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP

In response to this:

/cherrypick enterprise-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
Copy link

openshift-cherrypick-robot commented Oct 28, 2025

@bergerhoffer: #101159 failed to apply on top of branch "enterprise-4.20":

Applying: OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP
.git/rebase-apply/patch:82: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
A	microshift_release_notes/microshift-4-12-release-notes.adoc
A	microshift_release_notes/microshift-4-13-release-notes.adoc
A	microshift_release_notes/microshift-4-14-release-notes.adoc
A	release_notes/ocp-4-1-release-notes.adoc
A	release_notes/ocp-4-10-release-notes.adoc
A	release_notes/ocp-4-11-release-notes.adoc
A	release_notes/ocp-4-12-release-notes.adoc
A	release_notes/ocp-4-13-release-notes.adoc
A	release_notes/ocp-4-14-release-notes.adoc
A	release_notes/ocp-4-2-release-notes.adoc
A	release_notes/ocp-4-3-release-notes.adoc
A	release_notes/ocp-4-4-release-notes.adoc
A	release_notes/ocp-4-5-release-notes.adoc
A	release_notes/ocp-4-6-release-notes.adoc
A	release_notes/ocp-4-7-release-notes.adoc
A	release_notes/ocp-4-8-release-notes.adoc
A	release_notes/ocp-4-9-release-notes.adoc
M	storage/container_storage_interface/persistent-storage-csi-azure-file.adoc
Falling back to patching base and 3-way merge...
Auto-merging storage/container_storage_interface/persistent-storage-csi-azure-file.adoc
CONFLICT (modify/delete): release_notes/ocp-4-9-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-9-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-8-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-8-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-7-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-7-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-6-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-6-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-5-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-5-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-4-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-4-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-3-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-3-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-2-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-2-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-14-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-14-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-13-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-13-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-12-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-12-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-11-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-11-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-10-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-10-release-notes.adoc left in tree.
CONFLICT (modify/delete): release_notes/ocp-4-1-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of release_notes/ocp-4-1-release-notes.adoc left in tree.
CONFLICT (modify/delete): microshift_release_notes/microshift-4-14-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of microshift_release_notes/microshift-4-14-release-notes.adoc left in tree.
CONFLICT (modify/delete): microshift_release_notes/microshift-4-13-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of microshift_release_notes/microshift-4-13-release-notes.adoc left in tree.
CONFLICT (modify/delete): microshift_release_notes/microshift-4-12-release-notes.adoc deleted in HEAD and modified in OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP. Version OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP of microshift_release_notes/microshift-4-12-release-notes.adoc left in tree.
Auto-merging installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.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 OSDOCS#16699: Adding missing mod-docs-content-types for assemblies for core OCP

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.

This was referenced Oct 28, 2025
Merged
Merged
Merged
Merged
This was referenced Oct 28, 2025
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bscott-rh bscott-rh bscott-rh approved these changes

Assignees

No one assigned

Labels

branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 ok-to-merge size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.

4 participants

@bergerhoffer @ocpdocs-previewbot @bscott-rh @openshift-cherrypick-robot