aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Collapse)AuthorAgeFilesLines
* Fix tests from different projects running in parallel in SBT 0.12Matei Zaharia2013-04-112-3/+5
|
* Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0'Matei Zaharia2013-04-081-1/+1
|\ | | | | | | | | | | Conflicts: docs/_config.yml project/SparkBuild.scala
| * Bump development version to 0.8.0Jey Kottalam2013-03-281-1/+1
| |
* | Merge remote-tracking branch 'kalpit/master'Matei Zaharia2013-04-073-6/+6
|\ \ | | | | | | | | | | | | Conflicts: project/SparkBuild.scala
| * | upgraded sbt version, sbt plugins and some library dependencies to latest ↵kalpit2013-03-263-9/+9
| |/ | | | | | | stable version
* | Merge pull request #552 from MLnick/masterMatei Zaharia2013-04-071-1/+1
|\ \ | | | | | | Bumping version for Twitter Algebird to latest
| * | Bumping Algebird version in examples now that it supports JDK 1.6Nick Pentreath2013-04-031-1/+1
| | |
* | | Update build to Scala 2.9.3Andy Konwinski2013-04-042-5/+5
| |/ |/|
* | Re-enable deprecation warnings since there are only twoHolden Karau2013-03-241-1/+1
| |
* | Makes the syntax highlighting on the build file not broken in emacs.Holden Karau2013-03-241-1/+1
|/
* Fix reference bug in Kryo serializer, add test, update versionHiral Patel2013-03-071-1/+1
|
* Change version to 0.7.1-SNAPSHOT for development branchMatei Zaharia2013-02-271-1/+1
|
* Change version number to 0.7.0Matei Zaharia2013-02-251-1/+1
|
* Update Hadoop dependency to 1.0.4Matei Zaharia2013-02-251-2/+2
|
* Moving akka dependency resolver to shared.Prashant Sharma2013-02-251-1/+3
|
* Fixed class paths and dependencies based on Matei's comments.Tathagata Das2013-02-241-4/+1
|
* Changed Algebird from 0.1.9 to 0.1.8Tathagata Das2013-02-241-1/+1
|
* Fixed resolver for akka-zeromqTathagata Das2013-02-221-0/+3
|
* Merge pull request #480 from MLnick/streaming-eg-algebirdTathagata Das2013-02-221-1/+2
|\ | | | | [Streaming] Examples using Twitter's Algebird library
| * Bumping Algebird to 0.1.9Nick Pentreath2013-02-211-1/+1
| |
| * Merge remote-tracking branch 'upstream/streaming' into streaming-eg-algebirdNick Pentreath2013-02-191-5/+3
| |\ | | | | | | | | | | | | Conflicts: project/SparkBuild.scala
| * | Adding streaming HyperLogLog example using AlgebirdNick Pentreath2013-02-191-1/+2
| | |
* | | fixes corresponding to review feedback at pull request #479Prashant Sharma2013-02-201-2/+2
| | |
* | | ZeroMQ stream as receiverPrashant Sharma2013-02-191-0/+1
| |/ |/|
* | Added TwitterInputDStream from example to StreamingContext. Renamed example ↵Tathagata Das2013-02-141-5/+3
|/ | | | TwitterBasic to TwitterPopularTags.
* Add easymock to SBT configuration.Charles Reiss2013-01-291-1/+2
|
* Add Maven build file for streaming, and fix some issues in SBT fileMatei Zaharia2013-01-201-7/+9
| | | | | | 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 branch 'master' into streamingTathagata Das2013-01-151-1/+3
|\ | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/spark/rdd/CoGroupedRDD.scala core/src/main/scala/spark/rdd/FilteredRDD.scala docs/_layouts/global.html docs/index.md run
| * Merge pull request #357 from tysonjh/masterMatei Zaharia2013-01-101-0/+1
| |\ | | | | | | JSON support added to WebUI
| | * Removed io.spray spray-json dependency as it is not needed.Tyson2013-01-091-1/+0
| | |
| | * Added the spray implicit marshaller libraryTyson2013-01-091-0/+2
| | | | | | | | | | | | Added the io.spray JSON library
| * | Retrieve jars to a flat directory so * can be used for the classpath.Stephen Haberman2013-01-081-0/+1
| | |
| * | Update Hadoop dependency to 1.0.3 as 0.20 has Sun specific dependencies. AlsoShivaram Venkataraman2013-01-071-1/+1
| | | | | | | | | | | | | | | fix SequenceFileRDDFunctions to pick the right type conversion across Hadoop versions
* | | Merge branch 'streaming-merge' into dev-mergeTathagata Das2013-01-071-1/+4
|\ \ \
| * \ \ Merge pull request #8 from radlab/twitter-examplePatrick Wendell2012-12-291-1/+4
| |\ \ \ | | | | | | | | | | Adding a Twitter InputDStream with an example
| | * | | Adding a Twitter InputDStream with an examplePatrick Wendell2012-12-211-1/+4
| | | | |
* | | | | Moved Spark Streaming examples to examples sub-project.Tathagata Das2013-01-061-1/+1
| | | | |
* | | | | Merge branch 'mesos' into dev-mergeTathagata Das2012-12-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge pull request #341 from rxin/4a3fb06ac2d11125feb08acbbd4df76d1e91b677Matei Zaharia2012-12-211-1/+1
| |\ \ \ | | | | | | | | | | Kryo2 update against Spark master
| | * | | Updated Kryo to 2.20.Reynold Xin2012-10-161-1/+1
| | | | |
* | | | | Merge branch 'master' of github.com:mesos/spark into devReynold Xin2012-12-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/spark/MapOutputTracker.scala core/src/main/scala/spark/PairRDDFunctions.scala core/src/main/scala/spark/ParallelCollection.scala core/src/main/scala/spark/RDD.scala core/src/main/scala/spark/rdd/BlockRDD.scala core/src/main/scala/spark/rdd/CartesianRDD.scala core/src/main/scala/spark/rdd/CoGroupedRDD.scala core/src/main/scala/spark/rdd/CoalescedRDD.scala core/src/main/scala/spark/rdd/FilteredRDD.scala core/src/main/scala/spark/rdd/FlatMappedRDD.scala core/src/main/scala/spark/rdd/GlommedRDD.scala core/src/main/scala/spark/rdd/HadoopRDD.scala core/src/main/scala/spark/rdd/MapPartitionsRDD.scala core/src/main/scala/spark/rdd/MapPartitionsWithSplitRDD.scala core/src/main/scala/spark/rdd/MappedRDD.scala core/src/main/scala/spark/rdd/PipedRDD.scala core/src/main/scala/spark/rdd/SampledRDD.scala core/src/main/scala/spark/rdd/ShuffledRDD.scala core/src/main/scala/spark/rdd/UnionRDD.scala core/src/main/scala/spark/storage/BlockManager.scala core/src/main/scala/spark/storage/BlockManagerId.scala core/src/main/scala/spark/storage/BlockManagerMaster.scala core/src/main/scala/spark/storage/StorageLevel.scala core/src/main/scala/spark/util/MetadataCleaner.scala core/src/main/scala/spark/util/TimeStampedHashMap.scala core/src/test/scala/spark/storage/BlockManagerSuite.scala run
| * | | | Let the slave notify the master block removal.Reynold Xin2012-12-201-1/+1
| | |_|/ | |/| |
* | | | Adding Flume InputDStreamPatrick Wendell2012-12-071-1/+2
| |_|/ |/| |
* | | Added kafka JARDenny2012-12-051-1/+1
| | |
* | | Working on kafka.Denny2012-11-061-1/+3
| | |
* | | Merge remote-tracking branch 'public/master' into devMatei Zaharia2012-10-242-18/+93
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/spark/BlockStoreShuffleFetcher.scala core/src/main/scala/spark/KryoSerializer.scala core/src/main/scala/spark/MapOutputTracker.scala core/src/main/scala/spark/RDD.scala core/src/main/scala/spark/SparkContext.scala core/src/main/scala/spark/executor/Executor.scala core/src/main/scala/spark/network/Connection.scala core/src/main/scala/spark/network/ConnectionManagerTest.scala core/src/main/scala/spark/rdd/BlockRDD.scala core/src/main/scala/spark/rdd/NewHadoopRDD.scala core/src/main/scala/spark/scheduler/ShuffleMapTask.scala core/src/main/scala/spark/scheduler/cluster/StandaloneSchedulerBackend.scala core/src/main/scala/spark/storage/BlockManager.scala core/src/main/scala/spark/storage/BlockMessage.scala core/src/main/scala/spark/storage/BlockStore.scala core/src/main/scala/spark/storage/StorageLevel.scala core/src/main/scala/spark/util/AkkaUtils.scala project/SparkBuild.scala run
| * | Bump up version to 0.7.0-SNAPSHOT for master branchMatei Zaharia2012-10-221-1/+1
| | |
| * | Update version to 0.6.1-SNAPSHOT to show this is in developmentMatei Zaharia2012-10-221-1/+1
| | |
| * | Support for Hadoop 2 distributions such as cdh4Thomas Dudziak2012-10-181-2/+8
| |/
| * Removing credentials line in build.Patrick Wendell2012-10-141-1/+0
| |