Tathagata Das f1d206c6b4 Merge branch 'standalone-driver' into driver-test ... Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala examples/src/main/java/org/apache/spark/streaming/examples/JavaNetworkWordCount.java streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala		2014-01-09 15:06:24 -08:00
..
src	Merge branch 'standalone-driver' into driver-test	2014-01-09 15:06:24 -08:00
pom.xml	Adding mockito to maven build	2014-01-08 00:45:41 -08:00