aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
* graph -> graphxAnkur Dave2014-01-091-6/+6
* Merge remote-tracking branch 'spark-upstream/master' into HEADAnkur Dave2014-01-082-89/+173
|\
| * Merge pull request #313 from tdas/project-refactorPatrick Wendell2014-01-071-26/+67
| |\
| | * Merge remote-tracking branch 'apache/master' into project-refactorTathagata Das2014-01-061-14/+40
| | |\
| | * | Added pom.xml for external projects and removed unnecessary dependencies and ...Tathagata Das2013-12-311-14/+7
| | * | Refactored kafka, flume, zeromq, mqtt as separate external projects, with the...Tathagata Das2013-12-301-25/+64
| | * | Refactored streaming project to separate out the twitter functionality.Tathagata Das2013-12-261-2/+11
| * | | Merge pull request #331 from holdenk/masterReynold Xin2014-01-071-1/+0
| |\ \ \
| | * | | Use awk to extract the versionHolden Karau2014-01-061-3/+0
| | * | | CR feedback (sbt -> sbt/sbt and correct JAR path in script) :)Holden Karau2014-01-051-1/+1
| | * | | Add a script to download sbt if not present on the systemHolden Karau2014-01-041-0/+2
| | | |/ | | |/|
| * | | Merge pull request #340 from ScrapCodes/sbt-fixesPatrick Wendell2014-01-061-5/+3
| |\ \ \
| | * | | Made java options to be applied during tests so that they become self explana...Prashant Sharma2014-01-061-5/+3
| | |/ /
| * / / SPARK-1005 Ning upgradePrashant Sharma2014-01-061-1/+1
| |/ /
| * | Merge remote-tracking branch 'apache-github/master' into remove-binariesPatrick Wendell2014-01-031-7/+25
| |\ \
| | * | Using name yarn-alpha/yarn instead of yarn-2.0/yarn-2.2Raymond Liu2014-01-031-8/+8
| | * | Add yarn/common/src/test dir in building scriptRaymond Liu2014-01-031-0/+7
| | * | Use unmanaged source dir to include common yarn codeRaymond Liu2014-01-031-11/+15
| | * | Reorganize yarn related codes into sub projects to remove duplicate files.Raymond Liu2014-01-031-8/+15
| * | | Changes on top of Prashant's patch.Patrick Wendell2014-01-031-0/+1
| * | | fixed review commentsPrashant Sharma2014-01-031-5/+9
| * | | 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
| |\ \ \ | | | |/ | | |/|
| * | | 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 branch 'master' into scala-2.10Raymond Liu2013-11-131-5/+30
| |\ \ \
| * | | | Updating to latest akka 2.2.3, which fixes our only failing Driver SuitePrashant Sharma2013-10-241-4/+4
| * | | | Merge branch 'scala-2.10' of github.com:ScrapCodes/spark into scala-2.10Prashant Sharma2013-10-101-8/+14
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into wip-merge-masterPrashant Sharma2013-10-081-6/+8
| | |\ \ \ \