diff options
| author | Ankur Dave <ankurdave@gmail.com> | 2014-01-08 21:19:08 -0800 |
|---|---|---|
| committer | Ankur Dave <ankurdave@gmail.com> | 2014-01-08 21:19:08 -0800 |
| commit | 91227566bc9d8aabaec3f2a37a09a17afa20989c (patch) | |
| tree | 80d19aac29217005b3f1cb08ca95fa08bbb9d946 /bin/compute-classpath.sh | |
| parent | 7210257ba3038d5e22d4b60fe9c3113dc45c3dff (diff) | |
| parent | 04d83fc37f9eef89c20331c85291a0a169f75e6d (diff) | |
| download | spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.tar.gz spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.tar.bz2 spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.zip | |
Merge remote-tracking branch 'spark-upstream/master' into HEAD
Conflicts:
README.md
core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala
core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala
core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
pom.xml
project/SparkBuild.scala
repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
Diffstat (limited to 'bin/compute-classpath.sh')
| -rwxr-xr-x | bin/compute-classpath.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index af22d85afc..c10725e708 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -20,13 +20,13 @@ # This script computes Spark's classpath and prints it to stdout; it's used by both the "run" # script and the ExecutorRunner in standalone cluster mode. -SCALA_VERSION=2.9.3 +SCALA_VERSION=2.10 # Figure out where Spark is installed FWDIR="$(cd `dirname $0`/..; pwd)" # Load environment variables from conf/spark-env.sh, if it exists -if [ -e $FWDIR/conf/spark-env.sh ] ; then +if [ -e "$FWDIR/conf/spark-env.sh" ] ; then . $FWDIR/conf/spark-env.sh fi |