-
- Downloads
Merge branch 'dev' of github.com:radlab/spark into dev-checkpoint
Conflicts: core/src/main/scala/spark/ParallelCollection.scala core/src/test/scala/spark/CheckpointSuite.scala streaming/src/main/scala/spark/streaming/DStream.scala
No related branches found
No related tags found
Showing
- core/src/main/scala/spark/ParallelCollection.scala 10 additions, 1 deletioncore/src/main/scala/spark/ParallelCollection.scala
- core/src/main/scala/spark/SparkContext.scala 9 additions, 1 deletioncore/src/main/scala/spark/SparkContext.scala
- core/src/test/scala/spark/CheckpointSuite.scala 8 additions, 8 deletionscore/src/test/scala/spark/CheckpointSuite.scala
- core/src/test/scala/spark/JavaAPISuite.java 2 additions, 0 deletionscore/src/test/scala/spark/JavaAPISuite.java
- project/SparkBuild.scala 5 additions, 2 deletionsproject/SparkBuild.scala
- streaming/lib/kafka-0.7.2.jar 0 additions, 0 deletionsstreaming/lib/kafka-0.7.2.jar
- streaming/src/main/scala/spark/streaming/DStream.scala 29 additions, 18 deletionsstreaming/src/main/scala/spark/streaming/DStream.scala
- streaming/src/main/scala/spark/streaming/DataHandler.scala 83 additions, 0 deletionsstreaming/src/main/scala/spark/streaming/DataHandler.scala
- streaming/src/main/scala/spark/streaming/FlumeInputDStream.scala 130 additions, 0 deletions...ng/src/main/scala/spark/streaming/FlumeInputDStream.scala
- streaming/src/main/scala/spark/streaming/NetworkInputDStream.scala 14 additions, 9 deletions.../src/main/scala/spark/streaming/NetworkInputDStream.scala
- streaming/src/main/scala/spark/streaming/NetworkInputTracker.scala 17 additions, 5 deletions.../src/main/scala/spark/streaming/NetworkInputTracker.scala
- streaming/src/main/scala/spark/streaming/RawInputDStream.scala 3 additions, 1 deletion...ming/src/main/scala/spark/streaming/RawInputDStream.scala
- streaming/src/main/scala/spark/streaming/SocketInputDStream.scala 3 additions, 69 deletions...g/src/main/scala/spark/streaming/SocketInputDStream.scala
- streaming/src/main/scala/spark/streaming/StreamingContext.scala 36 additions, 0 deletions...ing/src/main/scala/spark/streaming/StreamingContext.scala
- streaming/src/main/scala/spark/streaming/examples/FlumeEventCount.scala 43 additions, 0 deletions...main/scala/spark/streaming/examples/FlumeEventCount.scala
- streaming/src/main/scala/spark/streaming/examples/KafkaWordCount.scala 69 additions, 0 deletions.../main/scala/spark/streaming/examples/KafkaWordCount.scala
- streaming/src/main/scala/spark/streaming/input/KafkaInputDStream.scala 193 additions, 0 deletions.../main/scala/spark/streaming/input/KafkaInputDStream.scala
- streaming/src/test/scala/spark/streaming/CheckpointSuite.scala 6 additions, 6 deletions...ming/src/test/scala/spark/streaming/CheckpointSuite.scala
- streaming/src/test/scala/spark/streaming/InputStreamsSuite.scala 57 additions, 2 deletions...ng/src/test/scala/spark/streaming/InputStreamsSuite.scala
Loading
Please register or sign in to comment