Merge "Merge branch 'stable-2.14' into stable-2.15" into stable-2.15

This commit is contained in:
David Pursehouse
2017-10-05 23:09:37 +00:00
committed by Gerrit Code Review
5 changed files with 50 additions and 17 deletions

View File

@@ -289,7 +289,11 @@ fi
GERRIT_FDS=`get_config --int core.packedGitOpenFiles`
test -z "$GERRIT_FDS" && GERRIT_FDS=128
GERRIT_FDS=`expr $GERRIT_FDS + $GERRIT_FDS`
FDS_MULTIPLIER=2
USE_LFS=`get_config --get lfs.plugin`
test -n "$USE_LFS" && FDS_MULTIPLIER=3
GERRIT_FDS=`expr $FDS_MULTIPLIER \* $GERRIT_FDS`
test $GERRIT_FDS -lt 1024 && GERRIT_FDS=1024
GERRIT_STARTUP_TIMEOUT=`get_config --get container.startupTimeout`