Merge pull request #12511 from smarterclayton/increase_pod_timeout

Merged by openshift-bot
openshift · Jan 17, 2017 · 0b38fe0 · 0b38fe0
2 parents dc5ca90 + 492ff52
commit 0b38fe0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/util.go b/vendor/k8s.io/kubernetes/test/e2e/framework/util.go