Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

spark
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

972fe771

Commit 972fe771 authored 12 years ago by Tathagata Das

Downloads
- Plain Diff

Merge branch 'mesos-streaming' into streaming

Conflicts:
	streaming/src/test/java/spark/streaming/JavaAPISuite.java

parents 334ab924 991d3342

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

examples/src/main/scala/spark/streaming/examples/ActorWordCount.scala 1 addition, 1 deletion

.../main/scala/spark/streaming/examples/ActorWordCount.scala
streaming/src/main/scala/spark/streaming/api/java/JavaDStream.scala 4 additions, 1 deletion

...src/main/scala/spark/streaming/api/java/JavaDStream.scala
streaming/src/main/scala/spark/streaming/api/java/JavaDStreamLike.scala 45 additions, 12 deletions

...main/scala/spark/streaming/api/java/JavaDStreamLike.scala
streaming/src/main/scala/spark/streaming/api/java/JavaPairDStream.scala 4 additions, 31 deletions

...main/scala/spark/streaming/api/java/JavaPairDStream.scala
streaming/src/main/scala/spark/streaming/api/java/JavaStreamingContext.scala 1 addition, 1 deletion

...scala/spark/streaming/api/java/JavaStreamingContext.scala
streaming/src/test/java/spark/streaming/JavaAPISuite.java 45 additions, 2 deletions

streaming/src/test/java/spark/streaming/JavaAPISuite.java
streaming/src/test/java/spark/streaming/JavaTestUtils.scala 3 additions, 2 deletions

streaming/src/test/java/spark/streaming/JavaTestUtils.scala

with 103 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment