Matei Zaharia ba9338f104 Merge remote-tracking branch 'apache/master' into conf2 ... Conflicts: core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala		2013-12-31 18:23:14 -05:00
..
project	Adding Apache license to two files	2013-09-07 20:46:58 -07:00
build.properties	Change build and run instructions to use assemblies	2013-08-29 21:19:04 -07:00
plugins.sbt	Upgrade to sbt-assembly 0.9.2	2013-11-12 13:29:25 -08:00
SparkBuild.scala	Merge remote-tracking branch 'apache/master' into conf2	2013-12-31 18:23:14 -05:00