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/spark-simple-tutorial.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/spark-simple-tutorial.md')
-rw-r--r-- | docs/spark-simple-tutorial.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/spark-simple-tutorial.md b/docs/spark-simple-tutorial.md index 9875de62bd..fbdbc7d19d 100644 --- a/docs/spark-simple-tutorial.md +++ b/docs/spark-simple-tutorial.md @@ -13,7 +13,7 @@ title: Tutorial - Running a Simple Spark Application 3. Edit the ~/SparkTest/sbt/sbt file to look like this: - #!/bin/bash + #!/usr/bin/env bash java -Xmx800M -XX:MaxPermSize=150m -jar $(dirname $0)/sbt-launch-*.jar "$@" 4. To build a Spark application, you need Spark and its dependencies in a single Java archive (JAR) file. Create this JAR in Spark's main directory with sbt as: |