Merge pull request #12570 from sjenning/pick-37846

Merged by openshift-bot
openshift · Jan 26, 2017 · 13de265 · 13de265
2 parents adc5ee3 + fc37cae
commit 13de265
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go