Ankur Dave 5064f9b2d2 Merge remote-tracking branch 'spark-upstream/master' ... Conflicts: project/SparkBuild.scala		2013-10-30 15:59:09 -07: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	Change build and run instructions to use assemblies	2013-08-29 21:19:04 -07:00
SparkBuild.scala	Merge remote-tracking branch 'spark-upstream/master'	2013-10-30 15:59:09 -07:00