Skip to content

Conversation

@bergerhoffer
Copy link
Contributor

@bergerhoffer bergerhoffer commented Oct 27, 2025

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/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 27, 2025
@ocpdocs-previewbot
Copy link

🤖 Mon Oct 27 13:57:56 - Prow CI generated the docs preview:
https://101094--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci
Copy link

openshift-ci bot commented Oct 27, 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

/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
@bergerhoffer bergerhoffer changed the title Adding missing content types for core OCP snippets OSDOCS#16699: Adding missing content types for core OCP snippets 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
Copy link
Contributor

@bscott-rh bscott-rh left a comment

Choose a reason for hiding this comment

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

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

@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
@bergerhoffer bergerhoffer merged commit 46406df into openshift:main Oct 28, 2025
2 checks passed
@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.21

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@bergerhoffer: new pull request created: #101188

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

@bergerhoffer: new pull request created: #101189

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.

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.19

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@bergerhoffer: new pull request created: #101190

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.

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@bergerhoffer: new pull request created: #101191

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.

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@bergerhoffer: #101094 failed to apply on top of branch "enterprise-4.17":

Applying: Adding missing content types for core OCP snippets
Using index info to reconstruct a base tree...
A	snippets/ccoctl-provider-permissions-requirements.adoc
M	snippets/ibu-ImageBasedGroupUpgrade.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/ibu-ImageBasedGroupUpgrade.adoc
CONFLICT (modify/delete): snippets/ccoctl-provider-permissions-requirements.adoc deleted in HEAD and modified in Adding missing content types for core OCP snippets. Version Adding missing content types for core OCP snippets of snippets/ccoctl-provider-permissions-requirements.adoc left in tree.
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 Adding missing content types for core OCP snippets

In response to this:

/cherrypick enterprise-4.17

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

@bergerhoffer: #101094 failed to apply on top of branch "enterprise-4.16":

Applying: Adding missing content types for core OCP snippets
Using index info to reconstruct a base tree...
A	snippets/ccoctl-provider-permissions-requirements.adoc
M	snippets/ibu-ImageBasedGroupUpgrade.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/ibu-ImageBasedGroupUpgrade.adoc
CONFLICT (modify/delete): snippets/ccoctl-provider-permissions-requirements.adoc deleted in HEAD and modified in Adding missing content types for core OCP snippets. Version Adding missing content types for core OCP snippets of snippets/ccoctl-provider-permissions-requirements.adoc left in tree.
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 Adding missing content types for core OCP snippets

In response to this:

/cherrypick enterprise-4.16

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.

4 participants