Skip to content

Conversation

@lpettyjo
Copy link
Contributor

@lpettyjo lpettyjo commented Aug 5, 2025

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 5, 2025
@openshift-ci
Copy link

openshift-ci bot commented Aug 5, 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.

@gcharot
Copy link

gcharot commented Aug 6, 2025

LGTM

@jsafrane
Copy link
Contributor

lgtm

1 similar comment
@wsun1
Copy link

wsun1 commented Sep 2, 2025

lgtm

@lpettyjo lpettyjo merged commit fece335 into openshift:main Sep 16, 2025
2 checks passed
@lpettyjo
Copy link
Contributor Author

/cherrypick enterprise-4.20

@lpettyjo
Copy link
Contributor Author

/cherrypick enterprise-4.19

@lpettyjo
Copy link
Contributor Author

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@lpettyjo: new pull request created: #99129

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

@lpettyjo: new pull request created: #99130

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.17

@openshift-cherrypick-robot

@lpettyjo: new pull request created: #99131

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

@lpettyjo: #97172 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-15638#Add link for 3rd-party-certified CSI drivers
Using index info to reconstruct a base tree...
M	modules/persistent-storage-csi-drivers-supported.adoc
M	storage/container_storage_interface/persistent-storage-csi.adoc
Falling back to patching base and 3-way merge...
Auto-merging storage/container_storage_interface/persistent-storage-csi.adoc
Auto-merging modules/persistent-storage-csi-drivers-supported.adoc
CONFLICT (content): Merge conflict in modules/persistent-storage-csi-drivers-supported.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-15638#Add link for 3rd-party-certified CSI drivers

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.

@lpettyjo
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@lpettyjo: #97172 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-15638#Add link for 3rd-party-certified CSI drivers
Using index info to reconstruct a base tree...
M	modules/persistent-storage-csi-drivers-supported.adoc
M	storage/container_storage_interface/persistent-storage-csi.adoc
Falling back to patching base and 3-way merge...
Auto-merging storage/container_storage_interface/persistent-storage-csi.adoc
Auto-merging modules/persistent-storage-csi-drivers-supported.adoc
CONFLICT (content): Merge conflict in modules/persistent-storage-csi-drivers-supported.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-15638#Add link for 3rd-party-certified CSI drivers

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.

6 participants