Commit 50ec04d

openshift-merge-robot

authored

Aug 27, 2017

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

release-3.6(#15534)

·

2 parents 60e01e9 + c4b60af commit 50ec04dCopy full SHA for 50ec04d

1 file changed

+8

-5

lines changed

vendor/k8s.io/kubernetes/pkg/kubelet
- kubelet.go

1 file changed

+8

-5

lines changed

`‎vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go`

+8-5

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)

Please sign in to comment.