Merge pull request #20071 from liggitt/free-taint-manager-queue-3.10

[3.10] UPSTREAM: 65339: Remove item from taint manager workqueue on completion
openshift · Jun 22, 2018 · bb3ce3b · bb3ce3b
2 parents 77d84b0 + 10dc832
commit bb3ce3b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/nodelifecycle/scheduler/taint_manager.go b/vendor/k8s.io/kubernetes/pkg/controller/nodelifecycle/scheduler/taint_manager.go