Skip to content

Fix Configuring registry storage for VMware vSphere link#25856

Merged
bmcelvee merged 1 commit intoopenshift:masterfrom
bmcelvee:fix-reg-vsphere-link
Sep 29, 2020
Merged

Fix Configuring registry storage for VMware vSphere link#25856
bmcelvee merged 1 commit intoopenshift:masterfrom
bmcelvee:fix-reg-vsphere-link

Conversation

@bmcelvee
Copy link
Copy Markdown
Contributor

@bmcelvee bmcelvee commented Sep 29, 2020

Link pointed to top of page, not the specific section. Updated in this PR.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 29, 2020
@bmcelvee bmcelvee added this to the Next Release milestone Sep 29, 2020
@openshift-docs-preview-bot
Copy link
Copy Markdown

openshift-docs-preview-bot commented Sep 29, 2020

The preview will be available shortly at:

@bmcelvee bmcelvee added the peer-review-needed Signifies that the peer review team needs to review this PR label Sep 29, 2020
@bmcelvee
Copy link
Copy Markdown
Contributor Author

bmcelvee commented Sep 29, 2020

Just a link update, does not require QE review.

@bmcelvee
Copy link
Copy Markdown
Contributor Author

bmcelvee commented Sep 29, 2020

@openshift/team-documentation PTAL, thanks!

sheriff-rh
sheriff-rh approved these changes Sep 29, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@sheriff-rh sheriff-rh left a comment

Choose a reason for hiding this comment

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

LGTM! 🎉 🌮 🥇

@sheriff-rh sheriff-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Sep 29, 2020
@bmcelvee bmcelvee merged commit c9b766c into openshift:master Sep 29, 2020
@bmcelvee
Copy link
Copy Markdown
Contributor Author

bmcelvee commented Sep 29, 2020

/cherrypick enterprise-4.4

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Sep 29, 2020

@bmcelvee: #25856 failed to apply on top of branch "enterprise-4.4":

Applying: Fix Configuring registry storage for VMware vSphere link
Using index info to reconstruct a base tree...
M	installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
A	installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
A	installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
A	installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
M	installing/installing_vsphere/installing-vsphere-network-customizations.adoc
M	installing/installing_vsphere/installing-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_vsphere/installing-vsphere.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_vsphere/installing-vsphere-network-customizations.adoc
CONFLICT (modify/delete): installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc deleted in HEAD and modified in Fix Configuring registry storage for VMware vSphere link. Version Fix Configuring registry storage for VMware vSphere link of installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc deleted in HEAD and modified in Fix Configuring registry storage for VMware vSphere link. Version Fix Configuring registry storage for VMware vSphere link of installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc deleted in HEAD and modified in Fix Configuring registry storage for VMware vSphere link. Version Fix Configuring registry storage for VMware vSphere link of installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc left in tree.
Auto-merging installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
CONFLICT (content): Merge conflict in installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix Configuring registry storage for VMware vSphere link
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick enterprise-4.4

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.

@bmcelvee
Copy link
Copy Markdown
Contributor Author

bmcelvee commented Sep 29, 2020

/cherrypick enterprise-4.5

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 29, 2020
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Sep 29, 2020

@bmcelvee: new pull request created: #25861

Details

In response to this:

/cherrypick enterprise-4.5

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.

@bmcelvee
Copy link
Copy Markdown
Contributor Author

bmcelvee commented Sep 29, 2020

/cherrypick enterprise-4.6

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 29, 2020
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Sep 29, 2020

@bmcelvee: new pull request created: #25862

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.

@bmcelvee
Copy link
Copy Markdown
Contributor Author

bmcelvee commented Sep 29, 2020

Failed on a conflict with enterprise-4.4, so I'm just going to cherry pick back to 4.5.

@bobfuru
Copy link
Copy Markdown
Contributor

bobfuru commented Sep 29, 2020

Thanks for fixing this, @bmcelvee. I have related work in #25826 and noticed this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sheriff-rh sheriff-rh sheriff-rh approved these changes

Assignees

No one assigned

Labels

branch/enterprise-4.5 branch/enterprise-4.6 peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

6 participants

@bmcelvee @openshift-docs-preview-bot @openshift-cherrypick-robot @bobfuru @sheriff-rh @openshift-ci-robot