Matei Zaharia 71a958b0b7 Merge branch 'dev' of github.com:mesos/spark into dev ... Conflicts: project/SparkBuild.scala		2012-08-02 17:23:13 -04:00
..
project	Use new layout for plugins definitions (recommended for SBT 0.11)	2011-09-26 22:32:05 +01:00
build.properties	Update SBT and SBT-Eclipse version	2012-06-17 14:37:18 -07:00
plugins.sbt	Spark WebUI Implementation.	2012-08-01 11:01:09 -07:00
SparkBuild.scala	Merge branch 'dev' of github.com:mesos/spark into dev	2012-08-02 17:23:13 -04:00