aboutsummaryrefslogtreecommitdiff
path: root/project/SparkBuild.scala
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mesos/spark into graphReynold Xin2013-04-011-1/+1
|\
| * 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
* | Merge branch 'master' into graphReynold Xin2013-03-181-9/+11
|\|
| * 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
| |\
| | * 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
| | |\
| | * | 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 T...Tathagata Das2013-02-141-5/+3
| |/
* | Merge branch 'master' into graphReynold Xin2013-02-191-1/+2
|\|
| * Add easymock to SBT configuration.Charles Reiss2013-01-291-1/+2
* | Maven and sbt build changes for SparkGraph.Reynold Xin2013-02-191-1/+5
|/
* Add Maven build file for streaming, and fix some issues in SBT fileMatei Zaharia2013-01-201-7/+9
* Merge branch 'master' into streamingTathagata Das2013-01-151-1/+3
|\
| * Merge pull request #357 from tysonjh/masterMatei Zaharia2013-01-101-0/+1
| |\
| | * 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
| * | 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
* | | 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 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
| |\ \ \
| | * | | 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
|\| | | |
| * | | | 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-241-18/+88
|\| |
| * | 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
| * Comment out PGP stuff for publish-local to workMatei Zaharia2012-10-141-2/+4
| * Changed default Hadoop version back to 0.20.205Matei Zaharia2012-10-141-1/+1
| * Uncomment Maven publishing stuff and set version to 0.6.0Matei Zaharia2012-10-131-10/+9
| * Changing tabs to spacesPatrick Wendell2012-10-101-17/+17