aboutsummaryrefslogtreecommitdiff
path: root/run
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-04-07 20:54:18 -0400
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-04-07 20:54:18 -0400
commit1cb3eb9762439caea10fe817d9c69c01c3c8fb06 (patch)
tree8368349ec0419ded144c26eea8c039ff189d0731 /run
parenta1586412d647da1a192259a58b10d50b02f02a9c (diff)
parentaa9134f72a13cdc1fd1a662ec9389724e8e0e35f (diff)
downloadspark-1cb3eb9762439caea10fe817d9c69c01c3c8fb06.tar.gz
spark-1cb3eb9762439caea10fe817d9c69c01c3c8fb06.tar.bz2
spark-1cb3eb9762439caea10fe817d9c69c01c3c8fb06.zip
Merge remote-tracking branch 'kalpit/master'
Conflicts: project/SparkBuild.scala
Diffstat (limited to 'run')
-rwxr-xr-xrun2
1 files changed, 1 insertions, 1 deletions
diff --git a/run b/run
index 2c29cc4a66..ca25003708 100755
--- a/run
+++ b/run
@@ -1,6 +1,6 @@
#!/bin/bash
-SCALA_VERSION=2.9.2
+SCALA_VERSION=2.9.3
# Figure out where the Scala framework is installed
FWDIR="$(cd `dirname $0`; pwd)"