Merge pull request #15534 from sjenning/pick-49724-3.6

Automatic merge from submit-queue UPSTREAM: 49724: skip WaitForAttachAndMount for terminated pods in syncPod master PR #15533 This can wait for 3.6.1 @derekwaynecarr
openshift · Aug 27, 2017 · 50ec04d · 50ec04d
2 parents 60e01e9 + c4b60af
commit 50ec04d
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