diff options
| author | Nihad Abbasov <mail@narkoz.me> | 2012-09-24 09:05:09 -0700 |
|---|---|---|
| committer | Nihad Abbasov <mail@narkoz.me> | 2012-09-24 09:05:09 -0700 |
| commit | c3907bef59c986ce49b922cea6929486ad048970 (patch) | |
| tree | 82625c32e4ba9ae3dbf26d41949aff1a86fa5212 /config | |
| parent | 8ec956421c5e94bc2a51e30414d85417c10404b8 (diff) | |
| parent | e3b149fae611d9c66d3e41048970bd78f322cc9c (diff) | |
| download | gitlab-ce-c3907bef59c986ce49b922cea6929486ad048970.tar.gz | |
Merge pull request #1501 from caleywoods/master
Update timeout comment in unicorn example config.
Diffstat (limited to 'config')
| -rw-r--r-- | config/unicorn.rb.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 23746d255b4..425dbf33f86 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -6,7 +6,7 @@ working_directory app_dir # worker spawn times preload_app true -# nuke workers after 60 seconds (the default) +# nuke workers after 30 seconds (60 is the default) timeout 30 # listen on a Unix domain socket and/or a TCP port, |