diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2012-12-20 14:53:40 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2012-12-20 14:53:40 -0800 |
| commit | eac566a7f4a053fedd677fb067e29d98ce9e6e35 (patch) | |
| tree | 67a8e79bab238bc542107613dd5a852455c7767f /project | |
| parent | 2a87d816a24c62215d682e3a7af65489c0d6e708 (diff) | |
| parent | 5e51b889feac28787bfdb546b04d4b3752f3d8d1 (diff) | |
| download | spark-eac566a7f4a053fedd677fb067e29d98ce9e6e35.tar.gz spark-eac566a7f4a053fedd677fb067e29d98ce9e6e35.tar.bz2 spark-eac566a7f4a053fedd677fb067e29d98ce9e6e35.zip | |
Merge branch 'master' of github.com:mesos/spark into dev
Conflicts:
core/src/main/scala/spark/MapOutputTracker.scala
core/src/main/scala/spark/PairRDDFunctions.scala
core/src/main/scala/spark/ParallelCollection.scala
core/src/main/scala/spark/RDD.scala
core/src/main/scala/spark/rdd/BlockRDD.scala
core/src/main/scala/spark/rdd/CartesianRDD.scala
core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/main/scala/spark/rdd/CoalescedRDD.scala
core/src/main/scala/spark/rdd/FilteredRDD.scala
core/src/main/scala/spark/rdd/FlatMappedRDD.scala
core/src/main/scala/spark/rdd/GlommedRDD.scala
core/src/main/scala/spark/rdd/HadoopRDD.scala
core/src/main/scala/spark/rdd/MapPartitionsRDD.scala
core/src/main/scala/spark/rdd/MapPartitionsWithSplitRDD.scala
core/src/main/scala/spark/rdd/MappedRDD.scala
core/src/main/scala/spark/rdd/PipedRDD.scala
core/src/main/scala/spark/rdd/SampledRDD.scala
core/src/main/scala/spark/rdd/ShuffledRDD.scala
core/src/main/scala/spark/rdd/UnionRDD.scala
core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/BlockManagerId.scala
core/src/main/scala/spark/storage/BlockManagerMaster.scala
core/src/main/scala/spark/storage/StorageLevel.scala
core/src/main/scala/spark/util/MetadataCleaner.scala
core/src/main/scala/spark/util/TimeStampedHashMap.scala
core/src/test/scala/spark/storage/BlockManagerSuite.scala
run
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 05f3c59681..b2e0aff407 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -89,7 +89,7 @@ object SparkBuild extends Build { libraryDependencies ++= Seq( "org.eclipse.jetty" % "jetty-server" % "7.5.3.v20111011", - "org.scalatest" %% "scalatest" % "1.6.1" % "test", + "org.scalatest" %% "scalatest" % "1.8" % "test", "org.scalacheck" %% "scalacheck" % "1.9" % "test", "com.novocode" % "junit-interface" % "0.8" % "test", "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" |