Merge pull request #16913 from joelsmith/pick-53233-alt

Automatic merge from submit-queue (batch tested with PRs 16888, 16911, 16913, 16904). UPSTREAM: 53233: Remove containers from deleted pods once containers have exited xref kubernetes/kubernetes#53233 Note: I had to edit `podId` to `podID` to make it apply cleanly.
openshift · Oct 18, 2017 · 9bb5db6 · 9bb5db6
2 parents 0ba84ed + 1e1d423
commit 9bb5db6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go