From bbcba3a9430365640c0188e7ca6e0677d3227dd8 Mon Sep 17 00:00:00 2001
From: Reynold Xin <rxin@databricks.com>
Date: Mon, 5 Jan 2015 15:19:53 -0800
Subject: [SPARK-5093] Set spark.network.timeout to 120s consistently.

Author: Reynold Xin <rxin@databricks.com>

Closes #3903 from rxin/timeout-120 and squashes the following commits:

7c2138e [Reynold Xin] [SPARK-5093] Set spark.network.timeout to 120s consistently.
---
 docs/configuration.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs')

diff --git a/docs/configuration.md b/docs/configuration.md
index 7ada67fc30..2add48569b 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -820,12 +820,12 @@ Apart from these, the following properties are also available, and may be useful
 </tr>
 <tr>
   <td><code>spark.network.timeout</code></td>
-  <td>100</td>
+  <td>120</td>
   <td>
     Default timeout for all network interactions, in seconds. This config will be used in 
     place of <code>spark.core.connection.ack.wait.timeout</code>, <code>spark.akka.timeout</code>, 
-    <code>spark.storage.blockManagerSlaveTimeoutMs</code> or <code>spark.shuffle.io.connectionTimeout</code>, 
-    if they are not configured.  
+    <code>spark.storage.blockManagerSlaveTimeoutMs</code> or
+    <code>spark.shuffle.io.connectionTimeout</code>, if they are not configured.
   </td>
 </tr>
 <tr>
-- 
cgit v1.2.3