aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mesos/spark into graphReynold Xin2013-05-023-27/+71
|\
| * Remove spark-repl's extraneous dependency on spark-streamingJey Kottalam2013-05-011-1/+1
| * Build against Hadoop 1 by defaultMatei Zaharia2013-04-291-6/+6
| * Exclude old versions of Netty, which had a different Maven organizationMatei Zaharia2013-04-251-16/+19
| * Update unit test memory to 2 GBMatei Zaharia2013-04-251-1/+1
| * Add back line removed during YARN mergeMatei Zaharia2013-04-251-0/+1
| * Do not add signature files - results in validation errors when using assemble...Mridul Muralidharan2013-04-241-0/+1
| * Attempt at fixing merge conflictMridul Muralidharan2013-04-242-5/+5
| |\
| | * Turn on forking in test JVMs to reduce the pressure on perm gen and codeMatei Zaharia2013-04-181-0/+4
| | * Merge pull request #558 from ash211/patch-jackson-conflictMatei Zaharia2013-04-141-1/+1
| | |\
| | | * Don't pull in old versions of Jackson via hadoop-coreAndrew Ash2013-04-091-1/+1
| | * | 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
| | |\
| | | * Bump development version to 0.8.0Jey Kottalam2013-03-281-1/+1
| | * | Merge remote-tracking branch 'kalpit/master'Matei Zaharia2013-04-073-6/+6
| | |\ \
| | | * | upgraded sbt version, sbt plugins and some library dependencies to latest sta...kalpit2013-03-263-9/+9
| | | |/
| | * | Merge pull request #552 from MLnick/masterMatei Zaharia2013-04-071-1/+1
| | |\ \
| | | * | 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
| | | |/ | | |/|
| * | | Pull latest SparkBuild.scala from master and merge conflictsMridul Muralidharan2013-04-241-18/+25
| * | | Revert back to 2.0.2-alpha : 0.23.7 has protocol changes which break against ...Mridul Muralidharan2013-04-241-1/+2
| * | | Patch from Thomas Graves to improve the YARN Client, and move to more product...Mridul Muralidharan2013-04-241-2/+3
| * | | Fix review comments, add a new api to SparkHadoopUtil to create appropriate C...Mridul Muralidharan2013-04-221-4/+6
| * | | Move back to 2.0.2-alpha, since 2.0.3-alpha is not available in cloudera yet....Mridul Muralidharan2013-04-171-3/+7
| * | | Add support for building against hadoop2-yarn : adding new maven profile for itMridul Muralidharan2013-04-071-5/+29
| |/ /
* | | Code to run bagel vs graph experiments.Reynold Xin2013-04-071-1/+1
* | | 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
|\