diff options
| author | Masayoshi TSUZUKI <tsudukim@oss.nttdata.co.jp> | 2014-12-04 19:33:02 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2014-12-04 19:33:23 -0800 |
| commit | 6c436317881f384bbd760d84a0063d39e96229da (patch) | |
| tree | 977fc210c6a9dce6490b3033cee88d3754f625ac /docs | |
| parent | 63b1bc14ae131ee68959ff9c98a768a19cd6b5ba (diff) | |
| download | spark-6c436317881f384bbd760d84a0063d39e96229da.tar.gz spark-6c436317881f384bbd760d84a0063d39e96229da.tar.bz2 spark-6c436317881f384bbd760d84a0063d39e96229da.zip | |
[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 <tsudukim@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.
(cherry picked from commit ca379039f701e423fa07933db4e063cb85d0236a)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/spark-standalone.md | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md index d503bc961e..ae7b81d5bb 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> |