diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-07-31 21:35:12 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-07-31 21:35:12 -0700 |
| commit | 5cc725a0e3ef523affae8ff54dd74707e49d64e3 (patch) | |
| tree | ebd1698333d2df4194f17a9ea93a2f2eac2c7acd /docs/ec2-scripts.md | |
| parent | b7b627d5bb1a1331ea580950834533f84735df4c (diff) | |
| parent | f3cf09491a2b63e19a15e98cf815da503e4fb69b (diff) | |
| download | spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.tar.gz spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.tar.bz2 spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.zip | |
Merge branch 'master' into ec2-updates
Conflicts:
ec2/deploy.generic/root/mesos-ec2/ec2-variables.sh
Diffstat (limited to 'docs/ec2-scripts.md')
| -rw-r--r-- | docs/ec2-scripts.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/ec2-scripts.md b/docs/ec2-scripts.md index bae41f9406..bd787e0e46 100644 --- a/docs/ec2-scripts.md +++ b/docs/ec2-scripts.md @@ -110,9 +110,8 @@ permissions on your private key file, you can run `launch` with the # Configuration You can edit `/root/spark/conf/spark-env.sh` on each machine to set Spark configuration options, such -as JVM options and, most crucially, the amount of memory to use per machine (`SPARK_MEM`). -This file needs to be copied to **every machine** to reflect the change. The easiest way to do this -is to use a script we provide called `copy-dir`. First edit your `spark-env.sh` file on the master, +as JVM options. This file needs to be copied to **every machine** to reflect the change. The easiest way to +do this is to use a script we provide called `copy-dir`. First edit your `spark-env.sh` file on the master, then run `~/spark-ec2/copy-dir /root/spark/conf` to RSYNC it to all the workers. The [configuration guide](configuration.html) describes the available configuration options. |