Skip to content

Commit

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

[stage] UPSTREAM: 54593: Removed containers are not always waiting

xref #17042

cc @jupierce
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Oct 27, 2017
2 parents 71e50de + 5fd7ed9 commit 475f416
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 475f416

Please sign in to comment.