aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolden Karau <holden@pigscanfly.ca>2014-01-05 23:29:26 -0800
committerHolden Karau <holden@pigscanfly.ca>2014-01-05 23:29:26 -0800
commit2dc83de72e7803fbf69f55fd1edf1969bc48e074 (patch)
treeccbd390a972836568eae7223ba86e1aaebcea7a6
parent7d0094bb562926af1d9b84a19d85329674aee003 (diff)
downloadspark-2dc83de72e7803fbf69f55fd1edf1969bc48e074.tar.gz
spark-2dc83de72e7803fbf69f55fd1edf1969bc48e074.tar.bz2
spark-2dc83de72e7803fbf69f55fd1edf1969bc48e074.zip
CR feedback (sbt -> sbt/sbt and correct JAR path in script) :)
-rwxr-xr-xbin/run-example2
-rw-r--r--project/build.properties2
-rwxr-xr-xsbt/sbt2
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/run-example b/bin/run-example
index dfb4bf7baf..6c5d4a6a8f 100755
--- a/bin/run-example
+++ b/bin/run-example
@@ -55,7 +55,7 @@ if [ -e "$EXAMPLES_DIR"/target/spark-examples*[0-9Tg].jar ]; then
fi
if [[ -z $SPARK_EXAMPLES_JAR ]]; then
echo "Failed to find Spark examples assembly in $FWDIR/examples/target" >&2
- echo "You need to build Spark with sbt assembly before running this program" >&2
+ echo "You need to build Spark with sbt/sbt assembly before running this program" >&2
exit 1
fi
diff --git a/project/build.properties b/project/build.properties
index 059edac7d4..03438f6558 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -16,5 +16,5 @@
#
# Note: If you change the sbt version please also change the sbt download
-# script in the root directory of the project called sbt.
+# script sbt/sbt
sbt.version=0.12.4
diff --git a/sbt/sbt b/sbt/sbt
index 0951e9daa6..af422d9e89 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -35,7 +35,7 @@ else
printf "Our attempt to download sbt locally to ${JAR} failed. Please install sbt manually from http://www.scala-sbt.org/\n"
exit -1
fi
- printf "Launching sbt from .sbtlib\n"
+ printf "Launching sbt from ${JAR}\n"
java \
-Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=256m \
-jar ${JAR} \