Merge pull request #11674 from DirectXMan12/cherry-pick/repodigest

Merged by openshift-bot
openshift · Nov 2, 2016 · fc8773f · fc8773f
2 parents 90d8c62 + 8a78ecf
commit fc8773f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager_test.go