Merge pull request #17059 from sjenning/pick-54597-stage

Automatic merge from submit-queue. [stage] UPSTREAM: 54597: kubelet: check for illegal container state transition #17051 @frobware @joelsmith @derekwaynecarr
openshift · Oct 27, 2017 · 6e3c76a · 6e3c76a
2 parents 475f416 + 406a93d
commit 6e3c76a
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