-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Fix 4-6 CP merge conflict #26512
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.
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
Fix 4-6 CP merge conflict #26512
Conversation
|
The preview will be available shortly at: |
|
@bobfuru - did https://github.com/openshift/openshift-docs/pull/25826/files remove it from other files and the Power docs that we added re-added them? I can't find this, but just wanted to be sure. |
|
@vikram-redhat Upon further review, it looks like the only place where the Power docs re-added what #25826 removed was in |
|
Merging after Sl-ack by @vikram-redhat |
|
/cherrypick enterprise-4.6 |
|
@bobfuru: base branch (enterprise-4.6) needs to differ from target branch (enterprise-4.6) DetailsIn response to this:
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/test-infra repository. |
muscle memory, tried cherrypicking to same branch 😵 |
Bumped into a merge conflict when cherrypicking to 4.6 because of this PR merge: https://github.com/openshift/openshift-docs/pull/26184/files#diff-4af87df61050e4b8fe830bbb6be46aaab303d94d8e0b79e1ede86f612413395dR41-R76
So this is to resolve that issue in the
modules/registry-configuring-storage-baremetal.adocfile.@vikram-redhat @ktania It looks like this might also need to be updated in other related files for 4.6 branch? We have removed references to "NFS" as detailed in #25826.
I'm going to hold off on merging this to 4.6 until ack from @vikram-redhat.