Skip to content

Conversation

@lrx0014
Copy link

@lrx0014 lrx0014 commented Dec 11, 2018

Typo fixed:
Remove the duplicate content: master.example.com

Remove the duplicate content: master.example.com
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 11, 2018
@openshift-ci-robot
Copy link

Hi @lrx0014. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 11, 2018
@kalexand-rh
Copy link
Contributor

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 11, 2018
@kalexand-rh
Copy link
Contributor

@adellape, will you PTAL?

Copy link
Contributor

@adellape adellape left a comment

Choose a reason for hiding this comment

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

LGTM

@kalexand-rh
Copy link
Contributor

@jianlinliu, will you PTAL? It looks like this change just undoes the fix for this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1589952

@vikram-redhat
Copy link
Contributor

@jianlinliu bump.

@xltian

@jianlinliu
Copy link

LGTM. When I was reviewing the PR for https://bugzilla.redhat.com/show_bug.cgi?id=1589952, I missed the duplicate content.

@kalexand-rh
Copy link
Contributor

Thanks @jianlinliu! I'll apply it back to 3.9.

@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-3.11

@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-3.10

@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-3.9

@openshift-cherrypick-robot

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

Details

In response to this:

/cherrypick enterprise-3.11

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: #13076 failed to apply on top of branch "enterprise-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	install/host_preparation.adoc
Falling back to patching base and 3-way merge...
Auto-merging install/host_preparation.adoc
CONFLICT (content): Merge conflict in install/host_preparation.adoc
Patch failed at 0001 Remove duplicate content

Details

In response to this:

/cherrypick enterprise-3.10

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: #13076 failed to apply on top of branch "enterprise-3.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	install/host_preparation.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/install/host_preparation.adoc
CONFLICT (content): Merge conflict in install_config/install/host_preparation.adoc
Patch failed at 0001 Remove duplicate content

Details

In response to this:

/cherrypick enterprise-3.9

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-3.9 branch/enterprise-3.10 branch/enterprise-3.11 ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

7 participants