Merge pull request #10494 from ncdc/pick-30731

Merged by openshift-bot
openshift · Aug 18, 2016 · 65efdd8 · 65efdd8
2 parents ffd47ad + 1112158
commit 65efdd8
Show file tree

Hide file tree

Showing 4 changed files with 152 additions and 38 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/prober/prober.go b/vendor/k8s.io/kubernetes/pkg/kubelet/prober/prober.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/prober/prober_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/prober/prober_test.go