Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1647168 - base master for node labels #13515

Merged
merged 1 commit into from
Feb 5, 2019
Merged

Bug 1647168 - base master for node labels #13515

merged 1 commit into from
Feb 5, 2019

Conversation

jhoyt-rh
Copy link

@jhoyt-rh jhoyt-rh commented Feb 1, 2019

Creating new PR based on master to replace incorrect PR that had errors.

Previous (incorrect) PR was #13503

Prior to that, an earlier PR was based on enterprise-3.10, not master. That prior PR was #13438

@vikram-redhat PTAL

@jhoyt-rh jhoyt-rh added peer-review-done Signifies that the peer review team has reviewed this PR approved Indicates a PR has been approved by an approver from all required OWNERS files. branch/enterprise-3.10 branch/enterprise-3.11 labels Feb 1, 2019
@jhoyt-rh jhoyt-rh added this to the Next Release milestone Feb 1, 2019
@jhoyt-rh jhoyt-rh self-assigned this Feb 1, 2019
@jhoyt-rh jhoyt-rh merged commit 7c46711 into openshift:master Feb 5, 2019
@jhoyt-rh
Copy link
Author

jhoyt-rh commented Feb 5, 2019

/cherrypick enterprise-3.11

@openshift-cherrypick-robot

@jhoyt-rh: new pull request created: #13553

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.

@jhoyt-rh
Copy link
Author

jhoyt-rh commented Feb 5, 2019

/cherrypick enterprise-3.10

@openshift-cherrypick-robot

@jhoyt-rh: #13515 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_config/aggregate_logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/aggregate_logging.adoc
CONFLICT (content): Merge conflict in install_config/aggregate_logging.adoc
Patch failed at 0001 Bug 1647168 - base master for node labels

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.

@jhoyt-rh
Copy link
Author

jhoyt-rh commented Feb 5, 2019

trying cherrypick again. vpn had dropped. next comment will be the CP

@jhoyt-rh
Copy link
Author

jhoyt-rh commented Feb 5, 2019

/cherrypick enterprise-3.10

@openshift-cherrypick-robot

@jhoyt-rh: #13515 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_config/aggregate_logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/aggregate_logging.adoc
CONFLICT (content): Merge conflict in install_config/aggregate_logging.adoc
Patch failed at 0001 Bug 1647168 - base master for node labels

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.

@vikram-redhat
Copy link
Contributor

@jhoyt-rh - you have already put these changes in enterprise-3.10. This PR was to get these changes added to master and enterprise-3.11 for what you have already done in 3.10. That is why you are probably getting merge conflict errors.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. branch/enterprise-3.10 branch/enterprise-3.11 peer-review-done Signifies that the peer review team has reviewed this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants