Merge pull request #15533 from sjenning/pick-49724

Automatic merge from submit-queue UPSTREAM: 49724: skip WaitForAttachAndMount for terminated pods in syncPod Fixes #14383 xref kubernetes/kubernetes#49724 @derekwaynecarr @eparis @smarterclayton @jwforres
openshift · Aug 2, 2017 · b4901f6 · b4901f6
2 parents 13715b8 + 34a9be5
commit b4901f6
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go