Skip to content

Conversation

@kalexand-rh
Copy link
Contributor

@kalexand-rh kalexand-rh commented Jun 4, 2021

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 4, 2021
@netlify
Copy link

netlify bot commented Jun 4, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: c273366

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60be54ff647e10000888b917

😎 Browse the preview: https://deploy-preview-33109--osdocs.netlify.app

@retroflexer
Copy link

Thanks. LGTM.

@kalexand-rh
Copy link
Contributor Author

@jianlinliu, will you PTAL or send this to a better reviewer?

@jianlinliu
Copy link

LGTM

Copy link
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

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

Just one thing!

@bergerhoffer bergerhoffer added the peer-review-done Signifies that the peer review team has reviewed this PR label Jun 7, 2021
@kalexand-rh kalexand-rh merged commit 01acb7d into openshift:master Jun 7, 2021
@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-4.5

@kalexand-rh kalexand-rh deleted the BZ1950635 branch June 7, 2021 17:43
@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-4.6

@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-4.7

@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-4.8

@openshift-cherrypick-robot

@kalexand-rh: #33109 failed to apply on top of branch "enterprise-4.5":

Applying: BZ1950635: updating etcd and temporary control plane info
Using index info to reconstruct a base tree...
A	modules/installation-process.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/installation-process.adoc deleted in HEAD and modified in BZ1950635: updating etcd and temporary control plane info. Version BZ1950635: updating etcd and temporary control plane info of modules/installation-process.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 BZ1950635: updating etcd and temporary control plane info
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.

@openshift-cherrypick-robot

@kalexand-rh: #33109 failed to apply on top of branch "enterprise-4.6":

Applying: BZ1950635: updating etcd and temporary control plane info
Using index info to reconstruct a base tree...
A	modules/installation-process.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/installation-process.adoc deleted in HEAD and modified in BZ1950635: updating etcd and temporary control plane info. Version BZ1950635: updating etcd and temporary control plane info of modules/installation-process.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 BZ1950635: updating etcd and temporary control plane info
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

@kalexand-rh: new pull request created: #33168

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.

@openshift-cherrypick-robot

@kalexand-rh: new pull request created: #33169

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.

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants