diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-04 14:30:11 +0000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-09-08 23:01:23 +1000 |
| commit | 97c9e9da2e74c11b436cfa22cfc5953aae05b135 (patch) | |
| tree | fbeb89c1101ca3b328a098c02cd3976cc7259004 /config | |
| parent | bae2851152b39960eb0e1b861d4844d2ddb6d51e (diff) | |
| download | gitlab-ce-97c9e9da2e74c11b436cfa22cfc5953aae05b135.tar.gz | |
Merge branch 'bvl-increase-storage-check-timeout' into 'master'
Increase the timeout before aborting a storage access attempt
See merge request !14023
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 25285525846..67ccdf187d3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -509,7 +509,7 @@ production: &base failure_count_threshold: 10 # number of failures before stopping attempts failure_wait_time: 30 # Seconds after an access failure before allowing access again failure_reset_time: 1800 # Time in seconds to expire failures - storage_timeout: 5 # Time in seconds to wait before aborting a storage access attempt + storage_timeout: 30 # Time in seconds to wait before aborting a storage access attempt ## Backup settings |