commit 2fbfc6ebe4a9fd5769d104fa3257f0aa159933f6
author Shawn Pearce <sop@google.com> Mon Nov 09 18:59:10 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 09 18:59:10 2015 +0000
tree b7d6c17262d359f4c4c8c8784eb84cf50b73acc3
parent d67791d059cf26155240ead751b41569db2c478d
parent de482b0f5bfb64591bd1369380e5305eaebf4b56

Merge "Increase default value of receive.timeout"

Documentation/config-gerrit.txt

diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index e7b7cdc..923c72d 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -3031,7 +3031,7 @@
 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::

gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
index 5952568..899b06a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
@@ -72,7 +72,7 @@
     long getTimeoutMillis(@GerritServerConfig final Config cfg) {
       return ConfigUtil.getTimeUnit(
           cfg, "receive", null, "timeout",
-          TimeUnit.MINUTES.toMillis(2),
+          TimeUnit.MINUTES.toMillis(4),
           TimeUnit.MILLISECONDS);
     }
   }