Merge pull request #10503 from ncdc/pick-30624

Merged by openshift-bot
openshift · Aug 18, 2016 · 7a6947d · 7a6947d
2 parents 65efdd8 + 7da945e
commit 7a6947d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller.go