Merge "Increase default value of receive.timeout"

This commit is contained in:
Shawn Pearce 2015-11-09 18:59:10 +00:00 committed by Gerrit Code Review
commit 2fbfc6ebe4
2 changed files with 2 additions and 2 deletions

View File

@ -3031,7 +3031,7 @@ and updating references, not the time to index the pack. Values can
be specified using standard time unit abbreviations ('ms', 'sec',
'min', etc.).
+
Default is 2 minutes. If no unit is specified, milliseconds
Default is 4 minutes. If no unit is specified, milliseconds
is assumed.
[[receive.trustedKey]]receive.trustedKey::

View File

@ -72,7 +72,7 @@ public class AsyncReceiveCommits implements PreReceiveHook {
long getTimeoutMillis(@GerritServerConfig final Config cfg) {
return ConfigUtil.getTimeUnit(
cfg, "receive", null, "timeout",
TimeUnit.MINUTES.toMillis(2),
TimeUnit.MINUTES.toMillis(4),
TimeUnit.MILLISECONDS);
}
}