Merge pull request #16978 from smarterclayton/garbage

Automatic merge from submit-queue (batch tested with PRs 16912, 16931, 16939, 16967, 16978). UPSTREAM: 54308: The garbage collector creates too many pods Fixes #16878 #16838 Backport kubernetes/kubernetes#54308 We created too many pods
openshift · Oct 20, 2017 · f0d322f · f0d322f
2 parents c663d36 + b4b1084
commit f0d322f
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/vendor/k8s.io/kubernetes/test/e2e/garbage_collector.go b/vendor/k8s.io/kubernetes/test/e2e/garbage_collector.go