Skip to content

Conversation

sttts
Copy link
Contributor

@sttts sttts commented Apr 28, 2017

Follow-up of #13941

Also fixes #13946.

@deads2k
Copy link
Contributor

deads2k commented Apr 28, 2017

open upstream and rename this commit.

@deads2k
Copy link
Contributor

deads2k commented Apr 28, 2017

@derekwaynecarr you're an approver on pkg/controller. This is a carry we don't need to carry.

@sttts sttts force-pushed the sttts-taint-controller-test-time branch from 72b131b to f54f1f3 Compare April 28, 2017 14:39
@sttts
Copy link
Contributor Author

sttts commented Apr 28, 2017

done

@deads2k
Copy link
Contributor

deads2k commented Apr 28, 2017

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to f54f1f3

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test Running (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1035/) (Base Commit: cd4661d)

@deads2k
Copy link
Contributor

deads2k commented Apr 28, 2017

upstream is lgtm'ed. Will merge on green check job.

@deads2k
Copy link
Contributor

deads2k commented Apr 28, 2017

@deads2k
Copy link
Contributor

deads2k commented Apr 28, 2017

check is green. failure is #11452 merging

@deads2k deads2k merged commit ce1f661 into openshift:master Apr 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TestUpdateNode: taint_controller_test.go:440: Only one added taint tolerated: Unexepected test result. Expected delete true, got false
3 participants