You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2014/12/05 04:33:17 UTC
spark git commit: [SPARK-4464] Description about configuration
options need to be modified in docs.
Repository: spark
Updated Branches:
refs/heads/master 15cf3b012 -> ca379039f
[SPARK-4464] Description about configuration options need to be modified in docs.
Added description about -h and -host.
Modified description about -i and -ip which are now deprecated.
Added description about --properties-file.
Author: Masayoshi TSUZUKI <ts...@oss.nttdata.co.jp>
Closes #3329 from tsudukim/feature/SPARK-4464 and squashes the following commits:
6c07caf [Masayoshi TSUZUKI] [SPARK-4464] Description about configuration options need to be modified in docs.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ca379039
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ca379039
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ca379039
Branch: refs/heads/master
Commit: ca379039f701e423fa07933db4e063cb85d0236a
Parents: 15cf3b0
Author: Masayoshi TSUZUKI <ts...@oss.nttdata.co.jp>
Authored: Thu Dec 4 19:33:02 2014 -0800
Committer: Josh Rosen <jo...@databricks.com>
Committed: Thu Dec 4 19:33:02 2014 -0800
----------------------------------------------------------------------
docs/spark-standalone.md | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ca379039/docs/spark-standalone.md
----------------------------------------------------------------------
diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md
index d503bc9..ae7b81d 100644
--- a/docs/spark-standalone.md
+++ b/docs/spark-standalone.md
@@ -34,8 +34,12 @@ Finally, the following configuration options can be passed to the master and wor
<table class="table">
<tr><th style="width:21%">Argument</th><th>Meaning</th></tr>
<tr>
- <td><code>-i IP</code>, <code>--ip IP</code></td>
- <td>IP address or DNS name to listen on</td>
+ <td><code>-h HOST</code>, <code>--host HOST</code></td>
+ <td>Hostname to listen on</td>
+ </tr>
+ <tr>
+ <td><code>-i HOST</code>, <code>--ip HOST</code></td>
+ <td>Hostname to listen on (deprecated, use -h or --host)</td>
</tr>
<tr>
<td><code>-p PORT</code>, <code>--port PORT</code></td>
@@ -57,6 +61,10 @@ Finally, the following configuration options can be passed to the master and wor
<td><code>-d DIR</code>, <code>--work-dir DIR</code></td>
<td>Directory to use for scratch space and job output logs (default: SPARK_HOME/work); only on worker</td>
</tr>
+ <tr>
+ <td><code>--properties-file FILE</code></td>
+ <td>Path to a custom Spark properties file to load (default: conf/spark-defaults.conf)</td>
+ </tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org