aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 'master' into scala-2.10Prashant Sharma2013-10-011-2/+3
| | |\ \ \ \ \ \
| * | | | | | | | scala 2.10 requires Java 1.6,Martin Weindel2013-10-051-3/+3
| |/ / / / / / /
| * | | | | | | Sync with master and some build fixesPrashant Sharma2013-09-261-8/+8
| |\ \ \ \ \ \ \
| * | | | | | | | fixed maven build for scala 2.10Prashant Sharma2013-09-261-2/+1
| * | | | | | | | Akka 2.2 migrationPrashant Sharma2013-09-221-9/+9
| * | | | | | | | Merge branch 'master' of git://github.com/mesos/spark into scala-2.10Prashant Sharma2013-09-152-6/+31
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed repl suitePrashant Sharma2013-09-151-5/+5
| * | | | | | | | | Merged with masterPrashant Sharma2013-09-063-69/+142
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adding commons io as dependencyPrashant Sharma2013-07-151-1/+3
| * | | | | | | | | | Merge branch 'master' of github.com:mesos/spark into scala-2.10Prashant Sharma2013-07-151-3/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into master-mergePrashant Sharma2013-07-122-27/+31
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removed some unnecessary code and fixed dependenciesPrashant Sharma2013-07-111-8/+4
| * | | | | | | | | | | | Merge branch 'master' into master-mergePrashant Sharma2013-07-032-27/+73
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed a few test issues due to Akka 2.1, as well as SBT memory.Matei Zaharia2013-06-081-18/+26
| * | | | | | | | | | | | | Updated to latest stable scala 2.10.1 and akka 2.1.2Prashant Sharma2013-05-011-11/+8
| * | | | | | | | | | | | | Fixed pom.xml with updated dependencies.Prashant Sharma2013-04-291-2/+2
| * | | | | | | | | | | | | scala 2.10 and master mergePrashant Sharma2013-04-241-4/+4
| * | | | | | | | | | | | | Manually merged scala-2.10 and masterPrashant Sharma2013-04-223-15/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed previously removed dependenciesPrashant Sharma2013-04-101-2/+2
| * | | | | | | | | | | | | | porting of repl to scala-2.10Prashant Sharma2013-03-172-9/+12
| * | | | | | | | | | | | | | Moved to scala 2.10.0. Notable changes are:folone2013-01-143-38/+40
* | | | | | | | | | | | | | | Merge branch 'master' of github.com:apache/incubator-sparkReynold Xin2013-11-252-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #151 from russellcardullo/add-graphite-sinkMatei Zaharia2013-11-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add graphite sink for metricsRussell Cardullo2013-11-081-0/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #165 from NathanHowell/kerberos-masterMatei Zaharia2013-11-132-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Upgrade to sbt-assembly 0.9.2Nathan Howell2013-11-121-1/+1
| | * | | | | | | | | | | | | spark-assembly.jar fails to authenticate with YARN ResourceManagerNathan Howell2013-11-121-1/+1
| * | | | | | | | | | | | | | Merge pull request #137 from tgravescs/sparkYarnJarsHdfsRebaseMatei Zaharia2013-11-121-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add mockito to the sbt buildtgravescs2013-11-111-1/+2
| | |/ / / / / / / / / / / /
| * / / / / / / / / / / / / Add spark-tools assembly to spark-class classpath.Josh Rosen2013-11-091-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge remote-tracking branch 'spark-upstream/master'Ankur Dave2013-10-301-7/+22
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Exclude jopt from kafka dependency.Patrick Wendell2013-10-251-0/+1
| * | | | | | | | | | | | Fix Maven build to use MQTT repositoryMatei Zaharia2013-10-231-3/+3
| * | | | | | | | | | | | Merge pull request #64 from prabeesh/masterMatei Zaharia2013-10-231-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | remove unused dependencyprabeesh2013-10-171-2/+0
| | * | | | | | | | | | | | added mqtt adapter library dependenciesprabeesh2013-10-161-1/+7
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #56 from jerryshao/kafka-0.8-devMatei Zaharia2013-10-211-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Upgrade Kafka 0.7.2 to Kafka 0.8.0-beta1 for Spark Streamingjerryshao2013-10-121-3/+6
| * | | | | | | | | | | | | Merge pull request #66 from shivaram/sbt-assembly-depsMatei Zaharia2013-10-181-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Rename SBT target to assemble-deps.Shivaram Venkataraman2013-10-161-5/+5
| | * | | | | | | | | | | | | Merge branch 'master' of https://github.com/apache/incubator-spark into sbt-a...Shivaram Venkataraman2013-10-152-11/+44
| | |\| | | | | | | | | | | |
| | * | | | | | | | | | | | | Add a comment and exclude toolsShivaram Venkataraman2013-10-111-1/+2
| | * | | | | | | | | | | | | Add new SBT target for dependency assemblyShivaram Venkataraman2013-10-091-1/+7
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/apache/incubator-spark into index...Joseph E. Gonzalez2013-10-181-0/+1
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixing spark streaming example and a bug in examples build.Patrick Wendell2013-10-151-0/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | merged with upstream changesJoseph E. Gonzalez2013-10-141-7/+14
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #19 from aarondav/master-zkMatei Zaharia2013-10-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Standalone Scheduler fault tolerance using ZooKeeperAaron Davidson2013-09-261-0/+1
| * | | | | | | | | | | | Merge pull request #31 from sundeepn/branch-0.8Reynold Xin2013-10-071-5/+8
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | ask ivy/sbt to check local maven repo under ~/.m2Du Li2013-10-011-0/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |