Skip to content

Conversation

@bobfuru
Copy link
Contributor

@bobfuru bobfuru commented Oct 15, 2020

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.adoc file.

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

@bobfuru bobfuru added this to the Future Release milestone Oct 15, 2020
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 15, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@vikram-redhat
Copy link
Contributor

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

@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 19, 2020

@vikram-redhat Upon further review, it looks like the only place where the Power docs re-added what #25826 removed was in modules/registry-configuring-storage-baremetal.adoc. (We also removed NFS from vSphere image reg, which is what I was referring to with my earlier comment that "it looks like this might also need to be updated in other related files for 4.6 branch". But that obviously doesn't apply to ibm-z.)
This PR should be good to merge because it reapplies the changes I made to master. Sound good?

@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 19, 2020

Merging after Sl-ack by @vikram-redhat

@bobfuru bobfuru merged commit 1a1e876 into openshift:enterprise-4.6 Oct 19, 2020
@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 19, 2020

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 19, 2020

@bobfuru: base branch (enterprise-4.6) needs to differ from target branch (enterprise-4.6)

Details

In response to this:

/cherrypick enterprise-4.6

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.

@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 19, 2020

@bobfuru: base branch (enterprise-4.6) needs to differ from target branch (enterprise-4.6)

muscle memory, tried cherrypicking to same branch 😵

@bobfuru bobfuru deleted the BZ1850510-update-4-6-CP branch October 19, 2020 21:35
@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.6 size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants