-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Conversation
/cherrypick enterprise-3.11 |
@jhoyt-rh: new pull request created: #13553 In response to this:
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. |
/cherrypick enterprise-3.10 |
@jhoyt-rh: #13515 failed to apply on top of branch "enterprise-3.10":
In response to this:
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. |
trying cherrypick again. vpn had dropped. next comment will be the CP |
/cherrypick enterprise-3.10 |
@jhoyt-rh: #13515 failed to apply on top of branch "enterprise-3.10":
In response to this:
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 - 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. |
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