Reynold Xin 564d902d79 Merge branch 'master' of github.com:mesos/spark into graph ... Conflicts: run run2.cmd		2013-06-29 15:30:21 -07:00
..
project	Use new layout for plugins definitions (recommended for SBT 0.11)	2011-09-26 22:32:05 +01:00
build.properties	Fix tests from different projects running in parallel in SBT 0.12	2013-04-11 22:29:37 -04:00
plugins.sbt	Fix some dependency issues in SBT build (same will be needed for Maven):	2013-06-20 18:44:46 +02:00
SparkBuild.scala	Merge branch 'master' of github.com:mesos/spark into graph	2013-06-29 15:30:21 -07:00