Skip to content

Commit

Permalink
Merge pull request #17042 from joelsmith/master
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue.

UPSTREAM: 54593: Removed containers are not always waiting

xref kubernetes/kubernetes#54593

fixes #17011
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Oct 26, 2017
2 parents 4d27cb3 + deb4822 commit d3924ff
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go
View file

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

0 comments on commit d3924ff

Please sign in to comment.