Merge pull request #13513 from csrwng/remove_dm_daemon_version_15

UPSTREAM: 43460: Remove unused DockerManager daemon version [1.5]
openshift · Apr 20, 2017 · 1719327 · 1719327
2 parents f3e2e10 + d0d62c4
commit 1719327
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go