summaryrefslogtreecommitdiffstats
path: root/conftest.py
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-09 17:30:24 -0800
committerGitHub <noreply@github.com>2018-02-09 17:30:24 -0800
commitf18cfa7897d771cb973b9aa28a90bc3575b56f58 (patch)
tree88460cf1b89e4e2f3e4b6e00dcda5a5b2c18334d /conftest.py
parent64a6974ced70b17c34016732ae75b428d5925765 (diff)
parent1ea94e63d1f74edf7d866646a816bf9dc4f69072 (diff)
downloadopenshift-f18cfa7897d771cb973b9aa28a90bc3575b56f58.tar.gz
openshift-f18cfa7897d771cb973b9aa28a90bc3575b56f58.tar.bz2
openshift-f18cfa7897d771cb973b9aa28a90bc3575b56f58.tar.xz
openshift-f18cfa7897d771cb973b9aa28a90bc3575b56f58.zip
Merge pull request #7093 from sdodson/bz1534917
Automatic merge from submit-queue. Normalize the time we wait for pods to 5s * 60 retries A few people have run into situations where it takes longer than 120seconds for the webconsole to start up so lets be a bit more foregiving and allow for up to 5 minutes in scenarios where we're waiting for pods.
Diffstat (limited to 'conftest.py')
0 files changed, 0 insertions, 0 deletions