Merge pull request #18585 from sjenning/pick-59767

Automatic merge from submit-queue. UPSTREAM: 59767: kubelet: check for illegal phase transition kubernetes/kubernetes#59767 xref https://bugzilla.redhat.com/show_bug.cgi?id=1534492 @derekwaynecarr @smarterclayton @tnozicka
openshift · Feb 13, 2018 · d3da6a3 · d3da6a3
2 parents 48d2a6d + 4ffbc35
commit d3da6a3
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go