Skip to content

vSphere provides IPI network customization docs#30113

Merged
codyhoag merged 1 commit intoopenshift:masterfrom
codyhoag:vsphere-network-ipi
Mar 5, 2021
Merged

vSphere provides IPI network customization docs#30113
codyhoag merged 1 commit intoopenshift:masterfrom
codyhoag:vsphere-network-ipi

Conversation

@codyhoag
Copy link
Copy Markdown
Contributor

@codyhoag codyhoag commented Mar 4, 2021

@codyhoag codyhoag added this to the Next Release milestone Mar 4, 2021
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 4, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Mar 4, 2021

Deploy preview for osdocs ready!

Built with commit 54a8bbb

https://deploy-preview-30113--osdocs.netlify.app

@codyhoag
Copy link
Copy Markdown
Contributor Author

codyhoag commented Mar 4, 2021

@jianlinliu can you confirm this Installation support table update? Thanks!

@jianlinliu
Copy link
Copy Markdown

@jinyunma can you help review this?

@jinyunma
Copy link
Copy Markdown

jinyunma commented Mar 5, 2021

LGTM

@codyhoag codyhoag added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 5, 2021
@bmcelvee bmcelvee 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 Mar 5, 2021
@bmcelvee
Copy link
Copy Markdown
Contributor

bmcelvee commented Mar 5, 2021

LGTM!

@codyhoag codyhoag merged commit 05656fb into openshift:master Mar 5, 2021
@codyhoag
Copy link
Copy Markdown
Contributor Author

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: new pull request created: #30152

Details

In response to this:

/cherrypick enterprise-4.8

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.

@codyhoag
Copy link
Copy Markdown
Contributor Author

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: new pull request created: #30153

Details

In response to this:

/cherrypick enterprise-4.7

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.

@codyhoag
Copy link
Copy Markdown
Contributor Author

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.6

@codyhoag
Copy link
Copy Markdown
Contributor Author

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: #30113 failed to apply on top of branch "enterprise-4.6":

Applying: vSphere provides IPI network customization docs
Using index info to reconstruct a base tree...
A	installing/installing-preparing.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): installing/installing-preparing.adoc deleted in HEAD and modified in vSphere provides IPI network customization docs. Version vSphere provides IPI network customization docs of installing/installing-preparing.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 vSphere provides IPI network customization docs
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.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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: #30113 failed to apply on top of branch "enterprise-4.5":

Applying: vSphere provides IPI network customization docs
Using index info to reconstruct a base tree...
A	installing/installing-preparing.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): installing/installing-preparing.adoc deleted in HEAD and modified in vSphere provides IPI network customization docs. Version vSphere provides IPI network customization docs of installing/installing-preparing.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 vSphere provides IPI network customization docs
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.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.

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

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants