Skip to content

Resolves final error for registry docs #103441

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
dfitzmau merged 1 commit into from
Dec 5, 2025
Merged

Resolves final error for registry docs #103441

dfitzmau merged 1 commit into from
Dec 5, 2025

Conversation

@stevsmit
Copy link
Member

@stevsmit stevsmit commented Dec 4, 2025 •
edited
Loading

4.16+

No ticket for this final fix.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 4, 2025
@stevsmit stevsmit added this to the Continuous Release milestone Dec 4, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Dec 4, 2025 •
edited
Loading

🤖 Thu Dec 04 21:36:18 - Prow CI generated the docs preview:

https://103441--ocpdocs-pr.netlify.app/openshift-enterprise/latest/registry/configuring_registry_storage/configuring-registry-storage-baremetal.html
https://103441--ocpdocs-pr.netlify.app/openshift-enterprise/latest/registry/configuring_registry_storage/configuring-registry-storage-nutanix.html
https://103441--ocpdocs-pr.netlify.app/openshift-enterprise/latest/registry/configuring_registry_storage/configuring-registry-storage-rhodf.html
https://103441--ocpdocs-pr.netlify.app/openshift-enterprise/latest/registry/configuring_registry_storage/configuring-registry-storage-vsphere.html

@stevsmit stevsmit force-pushed the final-registry-followup branch from 76561ac to 80959ad Compare December 4, 2025 21:08
@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 Dec 4, 2025
@stevsmit stevsmit force-pushed the final-registry-followup branch from 80959ad to 4c14860 Compare December 4, 2025 21:29
@openshift-ci
Copy link

openshift-ci bot commented Dec 4, 2025

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

@dfitzmau dfitzmau merged commit c2b48dd into openshift:main Dec 5, 2025
2 checks passed
@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 5, 2025

/cherrypick enterprise-4.21

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 5, 2025

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 5, 2025

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 5, 2025

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 5, 2025

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 5, 2025

/cherrypick enterprise-4.16

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 5, 2025

@dfitzmau: new pull request created: #103451

Details

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 openshift-cherrypick-robot mentioned this pull request Dec 5, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 5, 2025

@dfitzmau: new pull request created: #103452

Details

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 openshift-cherrypick-robot mentioned this pull request Dec 5, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 5, 2025

@dfitzmau: new pull request created: #103453

Details

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 openshift-cherrypick-robot mentioned this pull request Dec 5, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 5, 2025

@dfitzmau: #103441 failed to apply on top of branch "enterprise-4.18":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Details

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
Copy link

openshift-cherrypick-robot commented Dec 5, 2025

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

Applying: Resolves final error for registry docs
Using index info to reconstruct a base tree...
M	registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-baremetal.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 Resolves final error for registry docs
Details

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
Copy link

openshift-cherrypick-robot commented Dec 5, 2025

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

Applying: Resolves final error for registry docs
Using index info to reconstruct a base tree...
M	registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-baremetal.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 Resolves final error for registry docs
Details

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.

@dfitzmau
Copy link
Contributor

dfitzmau commented Dec 5, 2025

/cherrypick enterprise-4.18

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 5, 2025

@dfitzmau: #103441 failed to apply on top of branch "enterprise-4.18":

Applying: Resolves final error for registry docs
Using index info to reconstruct a base tree...
M	registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-rhodf.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-nutanix.adoc
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc
CONFLICT (content): Merge conflict in registry/configuring_registry_storage/configuring-registry-storage-baremetal.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 Resolves final error for registry docs
Details

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.

@stevsmit stevsmit mentioned this pull request Dec 5, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@ocpdocs-vale-bot ocpdocs-vale-bot ocpdocs-vale-bot left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.

5 participants

@stevsmit @ocpdocs-previewbot @dfitzmau @openshift-cherrypick-robot @ocpdocs-vale-bot