Nick Pentreath 315ea069e8 Merge remote-tracking branch 'upstream/streaming' into streaming-eg-algebird ... Conflicts: project/SparkBuild.scala		2013-02-19 13:58:05 +02: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	Comment out PGP stuff for publish-local to work	2012-10-14 17:37:21 -07:00
SparkBuild.scala	Merge remote-tracking branch 'upstream/streaming' into streaming-eg-algebird	2013-02-19 13:58:05 +02:00