aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorStephen Haberman <stephen@exigencecorp.com>2013-01-22 15:25:41 -0600
committerStephen Haberman <stephen@exigencecorp.com>2013-01-25 11:03:00 -0600
commit7dfb82a992d47491174d7929e31351d26cadfcda (patch)
tree3609d51aefa8b577a391b1797c36bd3a1d620146 /docs
parent04bfee2d08a566c06ebb6278b56556e914814497 (diff)
downloadspark-7dfb82a992d47491174d7929e31351d26cadfcda.tar.gz
spark-7dfb82a992d47491174d7929e31351d26cadfcda.tar.bz2
spark-7dfb82a992d47491174d7929e31351d26cadfcda.zip
Replace old 'master' term with 'driver'.
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index 036a0df480..a7054b4321 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -202,7 +202,7 @@ Apart from these, the following properties are also available, and may be useful
<td>10</td>
<td>
Maximum message size to allow in "control plane" communication (for serialized tasks and task
- results), in MB. Increase this if your tasks need to send back large results to the master
+ results), in MB. Increase this if your tasks need to send back large results to the driver
(e.g. using <code>collect()</code> on a large dataset).
</td>
</tr>
@@ -211,7 +211,7 @@ Apart from these, the following properties are also available, and may be useful
<td>4</td>
<td>
Number of actor threads to use for communication. Can be useful to increase on large clusters
- when the master has a lot of CPU cores.
+ when the driver has a lot of CPU cores.
</td>
</tr>
<tr>
@@ -222,17 +222,17 @@ Apart from these, the following properties are also available, and may be useful
</td>
</tr>
<tr>
- <td>spark.master.host</td>
+ <td>spark.driver.host</td>
<td>(local hostname)</td>
<td>
- Hostname or IP address for the master to listen on.
+ Hostname or IP address for the driver to listen on.
</td>
</tr>
<tr>
- <td>spark.master.port</td>
+ <td>spark.driver.port</td>
<td>(random)</td>
<td>
- Port for the master to listen on.
+ Port for the driver to listen on.
</td>
</tr>
<tr>