Merge branch 'master' of github.com:coreos-inc/quay

2015-02-23 20:54:15 -05:00 · 2015-02-23 20:54:15 -05:00 · ef61145b2c
commit ef61145b2c
parent 7554c47a30 a0833b7978
6 changed files with 46 additions and 21 deletions
--- a/conf/gunicorn_verbs.py
+++ b/conf/gunicorn_verbs.py
@ -3,3 +3,4 @@ workers = 4
 logconfig = 'conf/logging.conf'
 pythonpath = '.'
 preload_app = True
+timeout = 2000  # Because sync workers