diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-14 17:39:34 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-14 17:39:34 -0400 |
| commit | 7c77b2fa6a17bf5e382f03b0f6343ae7caed6925 (patch) | |
| tree | 24ae5e2a681ed33ebda3d3b3c01adabb49fcad34 | |
| parent | 1450fd74d91b1fb7e25879e40abff76731ee5b28 (diff) | |
| parent | c86af80022beeec23267cc21f438605daed0997c (diff) | |
| download | spark-0.3-scala-2.9.tar.gz spark-0.3-scala-2.9.tar.bz2 spark-0.3-scala-2.9.zip | |
Merge branch 'master' into scala-2.90.3-scala-2.9
Conflicts:
project/build.properties
| -rw-r--r-- | project/build.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/build.properties b/project/build.properties index c6613ea32a..9d61dc13d3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -3,6 +3,6 @@ project.organization=org.spark-project project.name=spark sbt.version=0.7.7 -project.version=0.3-SNAPSHOT +project.version=0.3 build.scala.versions=2.9.0-1 project.initialize=false |