Merge pull request #13953 from sttts/sttts-taint-controller-test-time

UPSTREAM: <carry>: taint-controller-tests: double 'a bit of time' to avoid flakes
openshift · Apr 28, 2017 · ce1f661 · ce1f661
2 parents e9d0a3a + f54f1f3
commit ce1f661
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/node/taint_controller_test.go b/vendor/k8s.io/kubernetes/pkg/controller/node/taint_controller_test.go