Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Attempt at fixing merge conflict | Mridul Muralidharan | 2013-04-24 | 6 | -79/+79 |
|\ | |||||
| * | Uniform whitespace across scala examples | Andrew Ash | 2013-04-09 | 4 | -76/+76 |
| | | |||||
| * | Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0' | Matei Zaharia | 2013-04-08 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | Conflicts: docs/_config.yml project/SparkBuild.scala | ||||
| | * | Bump development version to 0.8.0 | Jey Kottalam | 2013-03-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #552 from MLnick/master | Matei Zaharia | 2013-04-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Bumping version for Twitter Algebird to latest | ||||
| | * | | Bumping Algebird version in examples now that it supports JDK 1.6 | Nick Pentreath | 2013-04-03 | 1 | -1/+1 |
| | |/ | |||||
| * / | Corrected order of CountMinSketchMonoid arguments | Erik van oosten | 2013-04-02 | 1 | -1/+1 |
| |/ | |||||
* | | Fix review comments, add a new api to SparkHadoopUtil to create appropriate ↵ | Mridul Muralidharan | 2013-04-22 | 1 | -2/+8 |
| | | | | | | | | Configuration. Modify an example to show how to use SplitInfo | ||||
* | | Add support for building against hadoop2-yarn : adding new maven profile for it | Mridul Muralidharan | 2013-04-07 | 1 | -0/+43 |
|/ | |||||
* | Merge pull request #528 from MLnick/java-examples | Matei Zaharia | 2013-03-20 | 5 | -0/+278 |
|\ | | | | | [SPARK-707] Adding Java versions of Pi, LogQuery and K-Means examples | ||||
| * | Java indentation 4 --> 2 spaces | Nick Pentreath | 2013-03-20 | 3 | -200/+200 |
| | | |||||
| * | A few cosmetic changes for JavaKMeans | Nick Pentreath | 2013-03-19 | 1 | -1/+4 |
| | | |||||
| * | Adding Java K-Means example | Nick Pentreath | 2013-03-19 | 2 | -0/+112 |
| | | |||||
| * | Changes to more closely match line length limit style | Nick Pentreath | 2013-03-17 | 1 | -3/+5 |
| | | |||||
| * | Adding Java versions of Pi and LogQuery | Nick Pentreath | 2013-03-15 | 3 | -0/+161 |
| | | |||||
* | | Add a log4j compile dependency to fix build in IntelliJ | Mikhail Bautin | 2013-03-15 | 1 | -1/+1 |
|/ | | | | | Also rename parent project to spark-parent (otherwise it shows up as "parent" in IntelliJ, which is very confusing). | ||||
* | bump version to 0.7.1-SNAPSHOT in the subproject poms to keep the maven ↵ | Mark Hamstra | 2013-02-28 | 1 | -1/+1 |
| | | | | build building. | ||||
* | Pass a code JAR to SparkContext in our examples. Fixes SPARK-594. | Matei Zaharia | 2013-02-25 | 35 | -82/+137 |
| | |||||
* | Fix compile error | Matei Zaharia | 2013-02-25 | 2 | -2/+2 |
| | |||||
* | Use public method sparkContext instead of protected sc in streaming examples | Matei Zaharia | 2013-02-25 | 3 | -4/+4 |
| | |||||
* | Changed Algebird from 0.1.9 to 0.1.8 | Tathagata Das | 2013-02-24 | 1 | -1/+1 |
| | |||||
* | Fixed bugs in examples. | Tathagata Das | 2013-02-24 | 3 | -4/+3 |
| | |||||
* | Fixed differences in APIs of StreamingContext and JavaStreamingContext. ↵ | Tathagata Das | 2013-02-23 | 1 | -1/+1 |
| | | | | Change rawNetworkStream to rawSocketStream, and added twitter, actor, zeroMQ streams to JavaStreamingContext. Also added them to JavaAPISuite. | ||||
* | Merge pull request #480 from MLnick/streaming-eg-algebird | Tathagata Das | 2013-02-22 | 3 | -4/+167 |
|\ | | | | | [Streaming] Examples using Twitter's Algebird library | ||||
| * | Adding documentation for HLL and CMS examples. More efficient and clear use ↵ | Nick Pentreath | 2013-02-21 | 2 | -12/+36 |
| | | | | | | | | of the monoids. | ||||
| * | Bumping Algebird to 0.1.9 | Nick Pentreath | 2013-02-21 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/streaming' into streaming-eg-algebird | Nick Pentreath | 2013-02-21 | 2 | -1/+67 |
| |\ | |||||
| * | | Streaming example using Twitter Algebird's Count Min Sketch monoid | Nick Pentreath | 2013-02-19 | 1 | -0/+78 |
| | | | |||||
| * | | Dependencies and refactoring for streaming HLL example, and using ↵ | Nick Pentreath | 2013-02-19 | 2 | -21/+14 |
| | | | | | | | | | | | | context.twitterStream method | ||||
| * | | Merge remote-tracking branch 'upstream/streaming' into streaming-eg-algebird | Nick Pentreath | 2013-02-19 | 10 | -108/+200 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: project/SparkBuild.scala | ||||
| * | | | Adding streaming HyperLogLog example using Algebird | Nick Pentreath | 2013-02-19 | 2 | -0/+67 |
| | | | | |||||
* | | | | Merge pull request #479 from ScrapCodes/zeromq-streaming | Tathagata Das | 2013-02-22 | 1 | -0/+73 |
|\ \ \ \ | |_|_|/ |/| | | | Zeromq streaming | ||||
| * | | | fixes corresponding to review feedback at pull request #479 | Prashant Sharma | 2013-02-20 | 1 | -3/+6 |
| | | | | |||||
| * | | | example for demonstrating ZeroMQ stream | Prashant Sharma | 2013-02-19 | 1 | -0/+70 |
| | |/ | |/| | |||||
* | | | Merge branch 'mesos-streaming' into streaming | Tathagata Das | 2013-02-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: streaming/src/test/java/spark/streaming/JavaAPISuite.java | ||||
| * | | | A bug fix post merge, following changes to AkkaUtils | Prashant Sharma | 2013-02-20 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'mesos-master' into streaming | Tathagata Das | 2013-02-20 | 1 | -0/+66 |
|\ \ \ | |/ / |/| | | | | | | | | | | | Conflicts: core/src/main/scala/spark/rdd/CheckpointRDD.scala streaming/src/main/scala/spark/streaming/dstream/ReducedWindowedDStream.scala | ||||
| * | | Fixing to match Spark styleguide | Patrick Wendell | 2013-02-05 | 1 | -8/+8 |
| | | | |||||
| * | | Adding an example with an OLAP roll-up | Patrick Wendell | 2013-02-04 | 1 | -0/+66 |
| |/ | |||||
* | | Added comment to the KafkaWordCount, given by Sean McNamara. | Tathagata Das | 2013-02-19 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'streaming' into ScrapCodes-streaming-actor | Tathagata Das | 2013-02-19 | 9 | -119/+46 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Changed networkStream to socketStream and pluggableNetworkStream to become ↵ | Tathagata Das | 2013-02-18 | 4 | -9/+9 |
| | | | | | | | | | | | | networkStream as a way to create streams from arbitrary network receiver. | ||||
| * | | Merge branch 'streaming' into ScrapCode-streaming | Tathagata Das | 2013-02-18 | 10 | -145/+64 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: streaming/src/main/scala/spark/streaming/dstream/KafkaInputDStream.scala streaming/src/main/scala/spark/streaming/dstream/NetworkInputDStream.scala | ||||
| | * | | Moved Java streaming examples to examples/src/main/java/spark/streaming/... ↵ | Tathagata Das | 2013-02-14 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | and fixed logging in NetworkInputTracker to highlight errors when receiver deregisters/shuts down. | ||||
| | * | | Added TwitterInputDStream from example to StreamingContext. Renamed example ↵ | Tathagata Das | 2013-02-14 | 2 | -91/+13 |
| | | | | | | | | | | | | | | | | TwitterBasic to TwitterPopularTags. | ||||
| | * | | Removed countByKeyAndWindow on paired DStreams, and added ↵ | Tathagata Das | 2013-02-14 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | countByValueAndWindow for all DStreams. Updated both scala and java API and testsuites. | ||||
| | * | | Merge branch 'mesos-master' into streaming | Tathagata Das | 2013-02-07 | 1 | -11/+17 |
| | |\| | |||||
| | | * | Remove activation of profiles by default | Mikhail Bautin | 2013-01-31 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | See the discussion at https://github.com/mesos/spark/pull/355 for why default profile activation is a problem. | ||||
| | | * | Add Maven build file for streaming, and fix some issues in SBT file | Matei Zaharia | 2013-01-20 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | As part of this, changed our Scala 2.9.2 Kafka library to be available as a local Maven repository, following the example in (http://blog.dub.podval.org/2010/01/maven-in-project-repository.html) | ||||
| | * | | Merge pull request #372 from Reinvigorate/sm-kafka | Tathagata Das | 2013-02-07 | 1 | -8/+8 |
| | |\ \ | | | |/ | | |/| | Removing offset management code that is non-existent in kafka 0.7.0+ |