Merge pull request #16906 from sjenning/pick-53167-stage

Automatic merge from submit-queue. [stage] UPSTREAM: 53167: Do not GC exited containers in running pods stage pick for #16896 @derekwaynecarr
openshift · Oct 18, 2017 · 7761e86 · 7761e86
2 parents bc2db51 + 7b6d1b0
commit 7761e86
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 63 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_gc.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_gc.go