aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'master' into spark-1002-remove-jarsPrashant Sharma2014-01-031-0/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2014-01-011-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2013-12-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into conf2Matei Zaharia2013-12-291-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | spark-544, introducing SparkConf and related configuration overhaul.Prashant Sharma2013-12-251-1/+2
* | | | | | | | | | | | | | | | | | Deleted py4j jar and added to assembly dependencyPrashant Sharma2014-01-021-0/+1
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #73 from falaki/ApproximateDistinctCountReynold Xin2013-12-311-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added stream 2.5.1 jar depenencyHossein Falaki2013-12-301-1/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | upgrade Netty from 4.0.0.Beta2 to 4.0.13.FinalBinh Nguyen2013-12-241-1/+1
|/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Show full stack trace and time taken in unit tests.Reynold Xin2013-12-231-1/+4
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | [SPARK-959] Explicitly depend on org.eclipse.jetty.orbit jarAaron Davidson2013-12-181-0/+2
* | | | | | | | | | | | | | Attempt with extra repositoriesPatrick Wendell2013-12-161-22/+10
* | | | | | | | | | | | | | Review comments on the PR for scala 2.10 migration.Prashant Sharma2013-12-131-3/+3
* | | | | | | | | | | | | | Disabled yarn 2.2 and added a message in the sbt buildPrashant Sharma2013-12-121-7/+17
* | | | | | | | | | | | | | Merge branch 'akka-bug-fix' of github.com:ScrapCodes/incubator-spark into akk...Prashant Sharma2013-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | added eclipse repository for spark streaming.Prashant Sharma2013-12-111-1/+1
* | | | | | | | | | | | | | | Merge branch 'master' into akka-bug-fixPrashant Sharma2013-12-111-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use published "org.spark-project.akka-*" in sbt build for Hadoop-2.2 dependen...Harvey Feng2013-12-031-13/+15
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into yarn-2.2Harvey Feng2013-11-261-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Add optional Hadoop 2.2 settings in sbt build.Harvey Feng2013-11-261-9/+23
* | | | | | | | | | | | | | | Merge branch 'master' into scala-2.10-wipPrashant Sharma2013-11-251-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #151 from russellcardullo/add-graphite-sinkMatei Zaharia2013-11-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add graphite sink for metricsRussell Cardullo2013-11-081-0/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Use Kafka 2.10 (again)Aaron Davidson2013-11-141-2/+3
* | | | | | | | | | | | | | Various merge correctionsAaron Davidson2013-11-141-9/+2
* | | | | | | | | | | | | | Some fixes for previous master merge commitsRaymond Liu2013-11-151-0/+1
* | | | | | | | | | | | | | Merge branch 'master' into scala-2.10Raymond Liu2013-11-142-3/+4
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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 branch 'master' into scala-2.10Raymond Liu2013-11-131-5/+30
|\| | | | | | | | | | | |
| * | | | | | | | | | | | 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
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Fixing spark streaming example and a bug in examples build.Patrick Wendell2013-10-151-0/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #19 from aarondav/master-zkMatei Zaharia2013-10-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Standalone Scheduler fault tolerance using ZooKeeperAaron Davidson2013-09-261-0/+1
* | | | | | | | | | | | | Updating to latest akka 2.2.3, which fixes our only failing Driver SuitePrashant Sharma2013-10-241-4/+4