aboutsummaryrefslogtreecommitdiff
path: root/bin
Commit message (Expand)AuthorAgeFilesLines
* [SPARK-1090] improvement on spark_shell (help information, configure memory)CodingCat2014-02-171-6/+42
* Merge pull request #534 from sslavic/patch-1. Closes #534.Stevo Slavić2014-02-041-1/+1
* Merge pull request #484 from tdas/run-example-fixPatrick Wendell2014-01-201-2/+11
|\
| * Removed SPARK_MEM from run-examples.Tathagata Das2014-01-201-5/+0
| * Made run-example respect SPARK_JAVA_OPTS and SPARK_MEM.Tathagata Das2014-01-201-2/+16
* | Merge pull request #449 from CrazyJvm/masterReynold Xin2014-01-201-3/+8
|\ \ | |/ |/|
| * fix some format problem.CrazyJvm2014-01-161-2/+2
| * fix "set MASTER automatically fails" bug.CrazyJvm2014-01-161-3/+8
* | Fixed Window spark shell launch script error.Qiuzhuang Lian2014-01-162-3/+3
|/
* Merge branch 'master' into graphxReynold Xin2014-01-131-6/+1
|\
| * Merge pull request #353 from pwendell/ipython-simplifyPatrick Wendell2014-01-091-6/+1
| |\
| | * Small fix suggested by joshPatrick Wendell2014-01-091-0/+1
| | * Simplify and fix pyspark script.Patrick Wendell2014-01-071-7/+1
* | | Finish d1d2b6d9b6b5f9cc45047507368a816903722d9eAnkur Dave2014-01-101-1/+0
* | | graph -> graphx in bin/compute-classpath.shAnkur Dave2014-01-091-2/+2
* | | Merge remote-tracking branch 'spark-upstream/master' into HEADAnkur Dave2014-01-0824-612/+709
|\| |
| * | Merge pull request #313 from tdas/project-refactorPatrick Wendell2014-01-071-6/+1
| |\ \ | | |/ | |/|
| | * Fixed examples/pom.xml and run-example based on Patrick's suggestions.Tathagata Das2014-01-071-6/+1
| * | CR feedback (sbt -> sbt/sbt and correct JAR path in script) :)Holden Karau2014-01-051-1/+1
| * | Finish documentation changesHolden Karau2014-01-052-2/+2
| |/
| * Merge remote-tracking branch 'apache-github/master' into remove-binariesPatrick Wendell2014-01-0324-610/+712
| |\
| | * sbin/compute-classpath* bin/compute-classpath*Prashant Sharma2014-01-034-2/+146
| | * sbin/spark-class* -> bin/spark-class*Prashant Sharma2014-01-036-4/+266
| | * run-example -> bin/run-examplePrashant Sharma2014-01-022-2/+2
| | * Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into s...Prashant Sharma2014-01-0221-752/+448
| |/|
| | * deprecate "spark" script and SPAKR_CLASSPATH environment variableAndrew xia2013-10-121-92/+0
| | * refactor $FWD variableAndrew xia2013-09-293-4/+4
| | * 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-261-33/+8
| | * add scripts in binshane-huang2013-09-238-10/+155
| | * moved user scripts to bin foldershane-huang2013-09-238-0/+418
| | * add admin scripts to sbinshane-huang2013-09-2313-704/+0
| | * added spark-class and spark-executor to sbinshane-huang2013-09-231-1/+1
| * | Merge branch 'master' into scala-2.10Raymond Liu2013-11-135-9/+57
| |\ \
| * | | version changed 2.9.3 -> 2.10 in shell script.Prashant Sharma2013-09-151-1/+1
| * | | Merged with masterPrashant Sharma2013-09-0613-121/+251
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of github.com:mesos/spark into scala-2.10Prashant Sharma2013-07-152-49/+65
| |\ \ \
| * \ \ \ Merge branch 'master' into master-mergePrashant Sharma2013-07-122-0/+4
| |\ \ \ \
| * | | | | Removed some unnecessary code and fixed dependenciesPrashant Sharma2013-07-111-1/+1
* | | | | | Added GraphX to classpath.Reynold Xin2013-11-071-0/+1
* | | | | | Merge remote-tracking branch 'spark-upstream/master'Ankur Dave2013-10-301-4/+18
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #66 from shivaram/sbt-assembly-depsMatei Zaharia2013-10-181-4/+18
| |\ \ \ \ \
| | * | | | | Exclude assembly jar from classpath if using depsShivaram Venkataraman2013-10-161-10/+18
| | * | | | | Merge branch 'master' of https://github.com/apache/incubator-spark into sbt-a...Shivaram Venkataraman2013-10-151-2/+0
| | |\ \ \ \ \
| | * | | | | | Add new SBT target for dependency assemblyShivaram Venkataraman2013-10-091-0/+6
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master' of https://github.com/apache/incubator-spark into index...Joseph E. Gonzalez2013-10-183-3/+39
|\| | | | | |
| * | | | | | SPARK-627 , Implementing --config arguments in the scriptsKarthikTunga2013-10-161-1/+1
| * | | | | | SPARK-627 , Implementing --config arguments in the scriptsKarthikTunga2013-10-162-2/+2
| * | | | | | Implementing --config argument in the scriptsKarthikTunga2013-10-162-7/+10
| * | | | | | Merge branch 'master' of https://github.com/apache/incubator-sparkKarthikTunga2013-10-151-2/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |