Skip to content

Conversation

@dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Oct 24, 2025

PR adds CONTENT TYPE tags to modules that are missing the tag.

Version(s):
4.12+

Issue:

AsciiDoc Content Type Editor
AsciiDoc Content Type Editor-GH

Add. Info:

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 24, 2025

🤖 Wed Oct 29 10:03:41 - Prow CI generated the docs preview:
https://101051--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@dfitzmau dfitzmau force-pushed the CTEditor-z-to-the-r branch from ea8e30f to 8f24d13 Compare October 24, 2025 11:00
@dfitzmau dfitzmau force-pushed the CTEditor-z-to-the-r branch 5 times, most recently from aec03c6 to ba7970e Compare October 28, 2025 11:30
@dfitzmau dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 28, 2025
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

Very nice work, what a pain 😅

Some of these are pretty squishy, especially wrt to formatting that makes their content type unclear/debatable. Some should probably be modularized more fully to truly match the content type. All of that to say: please take these suggestions as suggestions, and if you disagree on any, you're probably as right as any of us until we have more clear standards on some of these types of topics 🤓

/remove-label merge-review-in-progress
/remove-label merge-review-needed

@openshift-ci
Copy link

openshift-ci bot commented Oct 28, 2025

@jeana-redhat: Those labels are not set on the issue: merge-review-in-progress

In response to this:

Very nice work, what a pain 😅

Some of these are pretty squishy, especially wrt to formatting that makes their content type unclear/debatable. Some should probably be modularized more fully to truly match the content type. All of that to say: please take these suggestions as suggestions, and if you disagree on any, you're probably as right as any of us until we have more clear standards on some of these types of topics 🤓

/remove-label merge-review-in-progress
/remove-label merge-review-needed

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-ci openshift-ci bot removed the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 28, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2025
@dfitzmau dfitzmau force-pushed the CTEditor-z-to-the-r branch from ba7970e to 1223565 Compare October 29, 2025 08:36
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2025
@dfitzmau dfitzmau force-pushed the CTEditor-z-to-the-r branch from 1223565 to 4eb68d6 Compare October 29, 2025 09:24
+
.. *During the build configuration stage*, a build pod is used to create an application container image from a base image and application source code.
+
.. *During the deployment configuration stage*, a deployment pod is used to deploy application pods from the application container image that was built in the build configuration stage. The deployment pod also deploys other resources such as services and routes. The deployment configuration begins after the build configuration succeeds.
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] Vale.Avoid: Avoid using 'deployment configuration'.

+
.. *During the build configuration stage*, a build pod is used to create an application container image from a base image and application source code.
+
.. *During the deployment configuration stage*, a deployment pod is used to deploy application pods from the application container image that was built in the build configuration stage. The deployment pod also deploys other resources such as services and routes. The deployment configuration begins after the build configuration succeeds.
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] RedHat.TermsErrors: Use 'deployment' rather than 'deployment configuration'. For more information, see RedHat.TermsErrors.

+
.. *During the build configuration stage*, a build pod is used to create an application container image from a base image and application source code.
+
.. *During the deployment configuration stage*, a deployment pod is used to deploy application pods from the application container image that was built in the build configuration stage. The deployment pod also deploys other resources such as services and routes. The deployment configuration begins after the build configuration succeeds.
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] Vale.Avoid: Avoid using 'deployment configuration'.

+
.. *During the deployment configuration stage*, a deployment pod is used to deploy application pods from the application container image that was built in the build configuration stage. The deployment pod also deploys other resources such as services and routes. The deployment configuration begins after the build configuration succeeds.
+
.. *After the deployment pod has started the application pods*, application failures can occur within the running application pods. For instance, an application might not behave as expected even though the application pods are in a `Running` state. In this scenario, you can access running application pods to investigate application failures within a pod.
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] RedHat.TermsErrors: Use 'for example' rather than 'For instance'. For more information, see RedHat.TermsErrors.

@openshift-ci
Copy link

openshift-ci bot commented Oct 29, 2025

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

@dfitzmau dfitzmau merged commit 899aa8c into openshift:main Oct 29, 2025
2 checks passed
@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.21

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.16

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.15

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #101287

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

@dfitzmau: new pull request created: #101288

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.

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #101289

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.

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #101290

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.

@openshift-cherrypick-robot

@dfitzmau: #101051 failed to apply on top of branch "enterprise-4.17":

Applying: CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r
.git/rebase-apply/patch:694: trailing whitespace.
You can assign roles to service accounts, in the same way that users are assigned role-based access. 
.git/rebase-apply/patch:713: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:725: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:781: trailing whitespace.
* Rules define what a user can create or access in a project. 
.git/rebase-apply/patch:1263: trailing whitespace.
.Example PersistentVolume object with a value specified in the initiatorName field. 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	contributing_to_docs/tools_and_setup.adoc
M	modules/red-hat-marketplace-features.adoc
M	modules/registry-removed.adoc
M	modules/samples-operator-configuration.adoc
M	modules/sdpolicy-platform.adoc
M	modules/sdpolicy-security.adoc
M	modules/storage-ephemeral-storage-manage.adoc
M	modules/storage-persistent-storage-block-volume.adoc
M	modules/storage-persistent-storage-pv.adoc
A	modules/telco-hub-acmMCH-yaml.adoc
M	modules/update-preparing-list.adoc
M	modules/update-preparing-migrate.adoc
M	modules/windows-machineset-aws.adoc
M	modules/windows-machineset-azure.adoc
M	modules/wmco-upgrades.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): modules/telco-hub-acmMCH-yaml.adoc deleted in HEAD and renamed to snippets/telco-hub-acmMCH-yaml.adoc in CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r. Version CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r of snippets/telco-hub-acmMCH-yaml.adoc left in tree.
Auto-merging modules/wmco-upgrades.adoc
Auto-merging modules/windows-machineset-azure.adoc
Auto-merging modules/windows-machineset-aws.adoc
Auto-merging modules/update-preparing-migrate.adoc
Auto-merging modules/update-preparing-list.adoc
Auto-merging modules/storage-persistent-storage-pv.adoc
Auto-merging modules/storage-persistent-storage-block-volume.adoc
Auto-merging modules/storage-ephemeral-storage-manage.adoc
Auto-merging modules/sdpolicy-security.adoc
Auto-merging modules/sdpolicy-platform.adoc
Auto-merging modules/samples-operator-configuration.adoc
Auto-merging modules/registry-removed.adoc
Auto-merging modules/red-hat-marketplace-features.adoc
Auto-merging contributing_to_docs/tools_and_setup.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 CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r

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

@dfitzmau: #101051 failed to apply on top of branch "enterprise-4.16":

Applying: CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r
Using index info to reconstruct a base tree...
M	contributing_to_docs/tools_and_setup.adoc
M	modules/red-hat-marketplace-features.adoc
M	modules/registry-authentication-enabled-registry-overview.adoc
M	modules/registry-integrated-openshift-registry.adoc
M	modules/registry-operator-configuration-resource-overview-aws-s3.adoc
M	modules/registry-operator-configuration-resource-overview-gcp-gcs.adoc
M	modules/registry-removed.adoc
M	modules/samples-operator-configuration.adoc
M	modules/sdpolicy-logging.adoc
M	modules/sdpolicy-networking.adoc
M	modules/sdpolicy-platform.adoc
M	modules/sdpolicy-security.adoc
M	modules/sdpolicy-storage.adoc
M	modules/storage-ephemeral-storage-manage.adoc
M	modules/storage-persistent-storage-block-volume.adoc
M	modules/storage-persistent-storage-pv.adoc
A	modules/telco-hub-acmMCH-yaml.adoc
M	modules/update-preparing-list.adoc
M	modules/update-preparing-migrate.adoc
M	modules/windows-machineset-aws.adoc
M	modules/windows-machineset-azure.adoc
M	modules/windows-machineset-gcp.adoc
M	modules/wmco-upgrades.adoc.git/rebase-apply/patch:694: trailing whitespace.
You can assign roles to service accounts, in the same way that users are assigned role-based access. 
.git/rebase-apply/patch:713: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:725: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:781: trailing whitespace.
* Rules define what a user can create or access in a project. 
.git/rebase-apply/patch:1263: trailing whitespace.
.Example PersistentVolume object with a value specified in the initiatorName field. 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.

Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): modules/telco-hub-acmMCH-yaml.adoc deleted in HEAD and renamed to snippets/telco-hub-acmMCH-yaml.adoc in CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r. Version CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r of snippets/telco-hub-acmMCH-yaml.adoc left in tree.
Auto-merging modules/wmco-upgrades.adoc
Auto-merging modules/windows-machineset-gcp.adoc
Auto-merging modules/windows-machineset-azure.adoc
Auto-merging modules/windows-machineset-aws.adoc
Auto-merging modules/update-preparing-migrate.adoc
Auto-merging modules/update-preparing-list.adoc
Auto-merging modules/storage-persistent-storage-pv.adoc
Auto-merging modules/storage-persistent-storage-block-volume.adoc
Auto-merging modules/storage-ephemeral-storage-manage.adoc
Auto-merging modules/sdpolicy-storage.adoc
Auto-merging modules/sdpolicy-security.adoc
Auto-merging modules/sdpolicy-platform.adoc
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/sdpolicy-logging.adoc
Auto-merging modules/samples-operator-configuration.adoc
Auto-merging modules/registry-removed.adoc
Auto-merging modules/registry-operator-configuration-resource-overview-gcp-gcs.adoc
Auto-merging modules/registry-operator-configuration-resource-overview-aws-s3.adoc
Auto-merging modules/registry-integrated-openshift-registry.adoc
Auto-merging modules/registry-authentication-enabled-registry-overview.adoc
Auto-merging modules/red-hat-marketplace-features.adoc
Auto-merging contributing_to_docs/tools_and_setup.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 CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r

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.

@openshift-cherrypick-robot

@dfitzmau: #101051 failed to apply on top of branch "enterprise-4.15":

Applying: CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r
Using index info to reconstruct a base tree...
M	contributing_to_docs/tools_and_setup.adoc
M	modules/red-hat-marketplace-features.adoc
M	modules/registry-authentication-enabled-registry-overview.adoc
M	modules/registry-integrated-openshift-registry.adoc
M	modules/registry-operator-configuration-resource-overview-aws-s3.adoc
M	modules/registry-operator-configuration-resource-overview-gcp-gcs.adoc
M	modules/registry-removed.adoc
M	modules/samples-operator-configuration.adoc
M	modules/sdpolicy-logging.adoc
M	modules/sdpolicy-networking.adoc
M	modules/sdpolicy-platform.adoc
M	modules/sdpolicy-security.adoc
M	modules/sdpolicy-storage.adoc
M	modules/security-hosts-vms-rhcos.adoc
M	modules/service-accounts-default.adoc
M	modules/service-accounts-granting-roles.adoc
M	modules/storage-ephemeral-storage-manage.adoc
M	modules/storage-persistent-storage-block-volume.adoc
M	modules/storage-persistent-storage-pv.adoc
A	modules/telco-hub-acmMCH-yaml.adoc
M	modules/understanding-update-channels.adoc
M	modules/update-preparing-list.adoc.git/rebase-apply/patch:694: trailing whitespace.
You can assign roles to service accounts, in the same way that users are assigned role-based access. 
.git/rebase-apply/patch:713: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:725: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:781: trailing whitespace.
* Rules define what a user can create or access in a project. 
.git/rebase-apply/patch:1263: trailing whitespace.
.Example PersistentVolume object with a value specified in the initiatorName field. 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.

M	modules/update-preparing-migrate.adoc
M	modules/windows-machineset-aws.adoc
M	modules/windows-machineset-azure.adoc
M	modules/windows-machineset-gcp.adoc
M	modules/windows-machineset-vsphere.adoc
M	modules/wmco-upgrades.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): modules/telco-hub-acmMCH-yaml.adoc deleted in HEAD and renamed to snippets/telco-hub-acmMCH-yaml.adoc in CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r. Version CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r of snippets/telco-hub-acmMCH-yaml.adoc left in tree.
Auto-merging modules/wmco-upgrades.adoc
Auto-merging modules/windows-machineset-vsphere.adoc
Auto-merging modules/windows-machineset-gcp.adoc
Auto-merging modules/windows-machineset-azure.adoc
Auto-merging modules/windows-machineset-aws.adoc
Auto-merging modules/update-preparing-migrate.adoc
Auto-merging modules/update-preparing-list.adoc
Auto-merging modules/understanding-update-channels.adoc
Auto-merging modules/storage-persistent-storage-pv.adoc
Auto-merging modules/storage-persistent-storage-block-volume.adoc
Auto-merging modules/storage-ephemeral-storage-manage.adoc
Auto-merging modules/service-accounts-granting-roles.adoc
Auto-merging modules/service-accounts-default.adoc
Auto-merging modules/security-hosts-vms-rhcos.adoc
Auto-merging modules/sdpolicy-storage.adoc
Auto-merging modules/sdpolicy-security.adoc
Auto-merging modules/sdpolicy-platform.adoc
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/sdpolicy-logging.adoc
Auto-merging modules/samples-operator-configuration.adoc
Auto-merging modules/registry-removed.adoc
Auto-merging modules/registry-operator-configuration-resource-overview-gcp-gcs.adoc
Auto-merging modules/registry-operator-configuration-resource-overview-aws-s3.adoc
Auto-merging modules/registry-integrated-openshift-registry.adoc
Auto-merging modules/registry-authentication-enabled-registry-overview.adoc
Auto-merging modules/red-hat-marketplace-features.adoc
Auto-merging contributing_to_docs/tools_and_setup.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 CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r

In response to this:

/cherrypick enterprise-4.15

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

@dfitzmau: #101051 failed to apply on top of branch "enterprise-4.14":

Applying: CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r
Using index info to reconstruct a base tree...
M	contributing_to_docs/tools_and_setup.adoc
M	modules/red-hat-marketplace-features.adoc
M	modules/registry-authentication-enabled-registry-overview.adoc
M	modules/registry-integrated-openshift-registry.adoc
M	modules/registry-operator-configuration-resource-overview-aws-s3.adoc
M	modules/registry-operator-configuration-resource-overview-gcp-gcs.adoc
M	modules/registry-removed.adoc
M	modules/samples-operator-configuration.adoc
M	modules/sdpolicy-logging.adoc
M	modules/sdpolicy-monitoring.adoc
M	modules/sdpolicy-networking.adoc
M	modules/sdpolicy-platform.adoc
M	modules/sdpolicy-security.adoc
M	modules/sdpolicy-storage.adoc
M	modules/security-hosts-vms-rhcos.adoc
M	modules/service-accounts-default.adoc
M	modules/service-accounts-granting-roles.adoc
M	modules/storage-ephemeral-storage-manage.adoc
M	modules/storage-persistent-storage-block-volume.adoc
M	modules/storage-persistent-storage-pv.adoc
A	modules/telco-hub-acmMCH-yaml.adoc
M	modules/understanding-update-channels.adoc.git/rebase-apply/patch:694: trailing whitespace.
You can assign roles to service accounts, in the same way that users are assigned role-based access. 
.git/rebase-apply/patch:713: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:725: trailing whitespace.
:_mod-docs-content-type: CONCEPT 
.git/rebase-apply/patch:781: trailing whitespace.
* Rules define what a user can create or access in a project. 
.git/rebase-apply/patch:1263: trailing whitespace.
.Example PersistentVolume object with a value specified in the initiatorName field. 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.

M	modules/update-preparing-list.adoc
M	modules/update-preparing-migrate.adoc
M	modules/windows-machineset-aws.adoc
M	modules/windows-machineset-azure.adoc
M	modules/windows-machineset-gcp.adoc
M	modules/windows-machineset-vsphere.adoc
M	modules/wmco-upgrades.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): modules/telco-hub-acmMCH-yaml.adoc deleted in HEAD and renamed to snippets/telco-hub-acmMCH-yaml.adoc in CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r. Version CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r of snippets/telco-hub-acmMCH-yaml.adoc left in tree.
Auto-merging modules/wmco-upgrades.adoc
Auto-merging modules/windows-machineset-vsphere.adoc
Auto-merging modules/windows-machineset-gcp.adoc
Auto-merging modules/windows-machineset-azure.adoc
Auto-merging modules/windows-machineset-aws.adoc
Auto-merging modules/update-preparing-migrate.adoc
Auto-merging modules/update-preparing-list.adoc
Auto-merging modules/understanding-update-channels.adoc
Auto-merging modules/storage-persistent-storage-pv.adoc
Auto-merging modules/storage-persistent-storage-block-volume.adoc
Auto-merging modules/storage-ephemeral-storage-manage.adoc
Auto-merging modules/service-accounts-granting-roles.adoc
Auto-merging modules/service-accounts-default.adoc
Auto-merging modules/security-hosts-vms-rhcos.adoc
Auto-merging modules/sdpolicy-storage.adoc
Auto-merging modules/sdpolicy-security.adoc
Auto-merging modules/sdpolicy-platform.adoc
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/sdpolicy-monitoring.adoc
Auto-merging modules/sdpolicy-logging.adoc
Auto-merging modules/samples-operator-configuration.adoc
Auto-merging modules/registry-removed.adoc
Auto-merging modules/registry-operator-configuration-resource-overview-gcp-gcs.adoc
Auto-merging modules/registry-operator-configuration-resource-overview-aws-s3.adoc
Auto-merging modules/registry-integrated-openshift-registry.adoc
Auto-merging modules/registry-authentication-enabled-registry-overview.adoc
Auto-merging modules/red-hat-marketplace-features.adoc
Auto-merging contributing_to_docs/tools_and_setup.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 CTEditor-z-to-the-r: Add missing module type tags to files starting with z-r

In response to this:

/cherrypick enterprise-4.14

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.

6 participants