diff options
author | Nick Pentreath <nick.pentreath@gmail.com> | 2013-12-15 08:34:05 +0200 |
---|---|---|
committer | Nick Pentreath <nick.pentreath@gmail.com> | 2013-12-15 08:34:05 +0200 |
commit | d36ee3b159dff04b3a3222d6c55ee27ba93cd074 (patch) | |
tree | 40c2010a53ddc13307e1645bed5de25c2ae2c133 /pyspark | |
parent | 8cdfb08c47131ce3438e5faf1222af2039424324 (diff) | |
parent | 7db916596144a8b9e55fabf859d921a093d3c59f (diff) | |
download | spark-d36ee3b159dff04b3a3222d6c55ee27ba93cd074.tar.gz spark-d36ee3b159dff04b3a3222d6c55ee27ba93cd074.tar.bz2 spark-d36ee3b159dff04b3a3222d6c55ee27ba93cd074.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'pyspark')
-rwxr-xr-x | pyspark | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -23,7 +23,7 @@ FWDIR="$(cd `dirname $0`; pwd)" # Export this as SPARK_HOME export SPARK_HOME="$FWDIR" -SCALA_VERSION=2.9.3 +SCALA_VERSION=2.10 # Exit if the user hasn't compiled Spark if [ ! -f "$FWDIR/RELEASE" ]; then |