Merge pull request #17051 from frobware/backpick-kubernetes-54597

Automatic merge from submit-queue. UPSTREAM: 54597: kubelet: check for illegal container state transition
openshift · Oct 28, 2017 · 7e45849 · 7e45849
2 parents 10ced13 + 912426b
commit 7e45849
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go