Tathagata Das 972fe7714f Merge branch 'mesos-streaming' into streaming ... Conflicts: streaming/src/test/java/spark/streaming/JavaAPISuite.java		2013-02-20 11:06:01 -08:00
..
src/main	Merge branch 'mesos-streaming' into streaming	2013-02-20 11:06:01 -08:00
pom.xml	Remove activation of profiles by default	2013-01-31 13:30:41 -08:00