Prashant Sharma 44fd30d3fb Merge branch 'master' into scala-2.10-wip ... Conflicts: core/src/main/scala/org/apache/spark/rdd/RDD.scala project/SparkBuild.scala		2013-11-25 18:10:54 +05:30
..
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 branch 'master' into scala-2.10-wip	2013-11-25 18:10:54 +05:30