Merge pull request #12529 from smarterclayton/delay

Merged by openshift-bot
openshift · Jan 18, 2017 · 68d4d0a · 68d4d0a
2 parents a05efad + 9679031
commit 68d4d0a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/test/e2e/pods.go b/vendor/k8s.io/kubernetes/test/e2e/pods.go