aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #325 from witgo/masterPatrick Wendell2014-01-0313-66/+92
|\
| * merge upstream/masterliguoqiang2014-01-0336-1236/+198
| |\
| * | Modify spark on yarn to create SparkConf processliguoqiang2014-01-037-48/+65
| * | Modify spark on yarn to create SparkConf processliguoqiang2014-01-0315-46/+56
* | | Merge pull request #317 from ScrapCodes/spark-915-segregate-scriptsPatrick Wendell2014-01-0362-161/+155
|\ \ \ | |_|/ |/| |
| * | sbin/compute-classpath* bin/compute-classpath*Prashant Sharma2014-01-035-3/+3
| * | sbin/spark-class* -> bin/spark-class*Prashant Sharma2014-01-0314-15/+15
| * | a few left over document changePrashant Sharma2014-01-023-4/+4
| * | pyspark -> bin/pysparkPrashant Sharma2014-01-025-19/+19
| * | run-example -> bin/run-examplePrashant Sharma2014-01-0219-31/+31
| * | spark-shell -> bin/spark-shellPrashant Sharma2014-01-029-15/+15
| * | Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into s...Prashant Sharma2014-01-0241-96/+90
| |\ \
| | * | deprecate "spark" script and SPAKR_CLASSPATH environment variableAndrew xia2013-10-127-99/+4
| | * | refactor $FWD variableAndrew xia2013-09-295-7/+7
| | * | Merge branch 'reorgscripts' into scripts-reorgshane-huang2013-09-2740-87/+175
| | |\ \
| | | * | rm bin/spark.cmd as we don't have windows test environment. Will added it lat...shane-huang2013-09-261-27/+0
| | | * | fix paths and change spark to use APP_MEM as application driver memory instea...shane-huang2013-09-263-35/+10
| | | * | fix pathshane-huang2013-09-261-1/+1
| | | * | add scripts in binshane-huang2013-09-2312-17/+163
| | | * | moved user scripts to bin foldershane-huang2013-09-2311-0/+0
| | | * | add admin scripts to sbinshane-huang2013-09-2314-47/+47
| | | * | added spark-class and spark-executor to sbinshane-huang2013-09-2314-22/+16
* | | | | Merge pull request #285 from colorant/yarn-refactorPatrick Wendell2014-01-0236-1226/+189
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix docs for yarnRaymond Liu2014-01-032-5/+2
| * | | | minor fix for loginfoRaymond Liu2014-01-031-1/+1
| * | | | move duplicate pom config into parent pomRaymond Liu2014-01-033-179/+84
| * | | | Using name yarn-alpha/yarn instead of yarn-2.0/yarn-2.2Raymond Liu2014-01-0318-30/+30
| * | | | Add yarn/common/src/test dir in building scriptRaymond Liu2014-01-031-0/+7
| * | | | Fix yarn/README.mdRaymond Liu2014-01-031-6/+4
| * | | | Clean up unused files for yarnRaymond Liu2014-01-034-311/+0
| * | | | Fix pom for build yarn/2.x with yarn/common into one jarRaymond Liu2014-01-034-36/+202
| * | | | Use unmanaged source dir to include common yarn codeRaymond Liu2014-01-031-11/+15
| * | | | merge yarn/scheduler yarn/common code into one directoryRaymond Liu2014-01-033-0/+0
| * | | | Need to send dummy hello message to actually estabilish akka connection.Raymond Liu2014-01-032-0/+4
| * | | | A few clean up for yarn 2.0 codeRaymond Liu2014-01-032-8/+7
| * | | | Update maven build documentationRaymond Liu2014-01-032-8/+4
| * | | | Fix yarn/README.md and update docs/running-on-yarn.mdRaymond Liu2014-01-032-3/+1
| * | | | Add README for yarn modulesRaymond Liu2014-01-031-0/+16
| * | | | some code clean up for Yarn 2.2Raymond Liu2014-01-032-3/+3
| * | | | Fix pom file for scala binary versionRaymond Liu2014-01-036-8/+8
| * | | | Fix yarn/assemble pom fileRaymond Liu2014-01-032-0/+75
| * | | | Change profile name new-yarn to hadoop2.2-yarnRaymond Liu2014-01-034-4/+4
| * | | | Fix pom for yarn code reorgnaize commitRaymond Liu2014-01-038-535/+264
| * | | | Reorganize yarn related codes into sub projects to remove duplicate files.Raymond Liu2014-01-0330-957/+337
|/ / / /
* | | | Merge pull request #323 from tgravescs/sparkconf_yarn_fixPatrick Wendell2014-01-0210-113/+101
|\ \ \ \
| * | | | fix yarn-clientThomas Graves2014-01-022-8/+10
| * | | | Fix yarn build after sparkConf changesThomas Graves2014-01-0210-109/+95
| |/ / /
* | | | Merge pull request #320 from kayousterhout/erroneous_failed_msgReynold Xin2014-01-022-12/+15
|\ \ \ \
| * | | | Remove erroneous FAILED state for killed tasks.Kay Ousterhout2014-01-022-12/+15
| |/ / /
* | | | Merge pull request #297 from tdas/window-improvementPatrick Wendell2014-01-029-172/+388
|\ \ \ \