Reynold Xin 81ad2fa331 Merge branch 'jdbc' of github.com:koeninger/spark ... Conflicts: project/SparkBuild.scala		2013-05-14 23:12:00 -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	Update build to Scala 2.9.3	2013-04-04 13:26:45 -07:00
SparkBuild.scala	Merge branch 'jdbc' of github.com:koeninger/spark	2013-05-14 23:12:00 -07:00