diff options
author | Reynold Xin <rxin@cs.berkeley.edu> | 2012-12-13 22:06:47 -0800 |
---|---|---|
committer | Reynold Xin <rxin@cs.berkeley.edu> | 2012-12-13 22:06:47 -0800 |
commit | 41e58a519ac107c118715b8b9701032dd3d9a2d2 (patch) | |
tree | c491c889e81aa50bbab6de879c349b09ce8d120d /docs/spark-standalone.md | |
parent | dc7d7fc28656948d94000e6532f1437d597cd4db (diff) | |
parent | 05e225f988796d05efbd5f7bf7303bbefebf54f0 (diff) | |
download | spark-41e58a519ac107c118715b8b9701032dd3d9a2d2.tar.gz spark-41e58a519ac107c118715b8b9701032dd3d9a2d2.tar.bz2 spark-41e58a519ac107c118715b8b9701032dd3d9a2d2.zip |
Merge branch 'master' of github.com:mesos/spark into spark-633
Diffstat (limited to 'docs/spark-standalone.md')
-rw-r--r-- | docs/spark-standalone.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md index ae630a0371..e0ba7c35cb 100644 --- a/docs/spark-standalone.md +++ b/docs/spark-standalone.md @@ -68,7 +68,7 @@ Finally, the following configuration options can be passed to the master and wor To launch a Spark standalone cluster with the deploy scripts, you need to set up two files, `conf/spark-env.sh` and `conf/slaves`. The `conf/spark-env.sh` file lets you specify global settings for the master and slave instances, such as memory, or port numbers to bind to, while `conf/slaves` is a list of slave nodes. The system requires that all the slave machines have the same configuration files, so *copy these files to each machine*. -In `conf/spark-env.sh`, you can set the following parameters, in addition to the [standard Spark configuration settongs](configuration.html): +In `conf/spark-env.sh`, you can set the following parameters, in addition to the [standard Spark configuration settings](configuration.html): <table class="table"> <tr><th style="width:21%">Environment Variable</th><th>Meaning</th></tr> |