aboutsummaryrefslogtreecommitdiff
path: root/pyspark
diff options
context:
space:
mode:
authorNick Pentreath <nick.pentreath@gmail.com>2013-12-15 08:34:05 +0200
committerNick Pentreath <nick.pentreath@gmail.com>2013-12-15 08:34:05 +0200
commitd36ee3b159dff04b3a3222d6c55ee27ba93cd074 (patch)
tree40c2010a53ddc13307e1645bed5de25c2ae2c133 /pyspark
parent8cdfb08c47131ce3438e5faf1222af2039424324 (diff)
parent7db916596144a8b9e55fabf859d921a093d3c59f (diff)
downloadspark-d36ee3b159dff04b3a3222d6c55ee27ba93cd074.tar.gz
spark-d36ee3b159dff04b3a3222d6c55ee27ba93cd074.tar.bz2
spark-d36ee3b159dff04b3a3222d6c55ee27ba93cd074.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'pyspark')
-rwxr-xr-xpyspark2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyspark b/pyspark
index 18f668ec97..8b34c98578 100755
--- a/pyspark
+++ b/pyspark
@@ -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