Merge pull request #13938 from sttts/sttts-44970

Merged by openshift-bot
openshift · May 1, 2017 · 4ba7b51 · 4ba7b51
2 parents 1ba9541 + 359f62c
commit 4ba7b51
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/remote/remote_runtime.go b/vendor/k8s.io/kubernetes/pkg/kubelet/remote/remote_runtime.go