Skip to content

Commit

Permalink
Merge pull request openshift#17051 from frobware/backpick-kubernetes-…
Browse files Browse the repository at this point in the history 
…54597

Automatic merge from submit-queue.

UPSTREAM: 54597: kubelet: check for illegal container state transition
  • Loading branch information
@openshift-merge-robot @frobware
openshift-merge-robot authored and frobware committed Dec 11, 2017
1 parent 008f2d5 commit 25292e6
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go
View file

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

0 comments on commit 25292e6

Please sign in to comment.