Tathagata Das 9e82be1503 Merge branch 'streaming' into ScrapCodes-streaming-actor ... Conflicts: docs/plugin-custom-receiver.md streaming/src/main/scala/spark/streaming/StreamingContext.scala streaming/src/main/scala/spark/streaming/dstream/KafkaInputDStream.scala streaming/src/main/scala/spark/streaming/dstream/PluggableInputDStream.scala streaming/src/main/scala/spark/streaming/receivers/ActorReceiver.scala streaming/src/test/scala/spark/streaming/InputStreamsSuite.scala		2013-02-19 02:48:50 -08:00
..
scala/spark/streaming	Merge branch 'streaming' into ScrapCodes-streaming-actor	2013-02-19 02:48:50 -08:00