aboutsummaryrefslogtreecommitdiff
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #352 from markhamstra/oldArchPatrick Wendell2014-01-071-8/+2
|\
| * Fix BlockManagerSuite#afterMark Hamstra2014-01-071-8/+2
* | Add log4j exclusion rule to maven.Patrick Wendell2014-01-072-4/+6
|/
* Merge pull request #318 from srowen/masterReynold Xin2014-01-076-38/+39
|\
| * Merge remote-tracking branch 'upstream/master'Sean Owen2014-01-0621-248/+520
| |\
| * | Suggested small changes to Java code for slightly more standard style, encaps...Sean Owen2014-01-026-38/+39
* | | formatting related fixes suggested by Patrick.Prashant Sharma2014-01-071-5/+1
* | | Allow configuration to be printed in logs for diagnosis.Prashant Sharma2014-01-071-0/+4
* | | Allow users to set arbitrary akka configurations via spark conf.Prashant Sharma2014-01-072-3/+12
* | | Fix test breaking downstream buildsPatrick Wendell2014-01-061-1/+1
* | | Merge pull request #330 from tgravescs/fix_addjars_null_handlingPatrick Wendell2014-01-061-2/+3
|\ \ \ | |_|/ |/| |
| * | Add warning to null setJars checkThomas Graves2014-01-061-1/+2
| * | Fix handling of empty SPARK_EXAMPLES_JARThomas Graves2014-01-041-1/+1
* | | Merge pull request #333 from pwendell/logging-silencePatrick Wendell2014-01-052-3/+25
|\ \ \
| * | | Responding to Aaron's reviewPatrick Wendell2014-01-051-0/+2
| * | | Provide logging when attempts to connect to the master fail.Patrick Wendell2014-01-051-1/+11
| * | | Quite akka when remote lifecycle logging is disabled.Patrick Wendell2014-01-051-2/+12
| |/ /
* | | Merge pull request #334 from pwendell/examples-fixReynold Xin2014-01-051-0/+6
|\ \ \
| * | | Removing SPARK_EXAMPLES_JAR in the codePatrick Wendell2014-01-051-0/+6
| |/ /
* / / Fall back to zero-arg constructor for Serializer initialization if there is n...Reynold Xin2014-01-052-2/+16
|/ /
* | Merge remote-tracking branch 'apache-github/master' into remove-binariesPatrick Wendell2014-01-034-7/+7
|\ \
| * \ Merge pull request #317 from ScrapCodes/spark-915-segregate-scriptsPatrick Wendell2014-01-034-7/+7
| |\ \
| | * | sbin/compute-classpath* bin/compute-classpath*Prashant Sharma2014-01-031-1/+1
| | * | sbin/spark-class* -> bin/spark-class*Prashant Sharma2014-01-033-5/+5
| | * | Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into s...Prashant Sharma2014-01-025-7/+7
| | |\ \ | | | |/ | | |/|
| | | * deprecate "spark" script and SPAKR_CLASSPATH environment variableAndrew xia2013-10-122-2/+1
| | | * Merge branch 'reorgscripts' into scripts-reorgshane-huang2013-09-275-7/+7
| | | |\
| | | | * fix paths and change spark to use APP_MEM as application driver memory instea...shane-huang2013-09-261-1/+1
| | | | * fix pathshane-huang2013-09-261-1/+1
| | | | * added spark-class and spark-executor to sbinshane-huang2013-09-234-6/+6
* | | | | Changes on top of Prashant's patch.Patrick Wendell2014-01-034-54/+35
* | | | | Restored the previously removed testPrashant Sharma2014-01-031-1/+12
* | | | | fixed review commentsPrashant Sharma2014-01-033-5/+19
* | | | | Merge branch 'master' into spark-1002-remove-jarsPrashant Sharma2014-01-0392-799/+1456
|\| | | |
| * | | | 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-024-157/+343
| |\ \ \ \
| | * | | | Added Apache boilerplate and class docs to PartitionerAwareUnionRDD.Tathagata Das2013-12-261-3/+33
| | * | | | Merge branch 'apache-master' into window-improvementTathagata Das2013-12-2628-1522/+975
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into window-improvementTathagata Das2013-12-2630-113/+395
| | |\ \ \ \ \
| | * | | | | | Fixed bug in PartitionAwareUnionRDDTathagata Das2013-12-261-6/+9
| | * | | | | | Added tests for PartitionerAwareUnionRDD in the CheckpointSuite. Refactored C...Tathagata Das2013-12-203-170/+231
| | * | | | | | Merge branch 'scheduler-update' into window-improvementTathagata Das2013-12-19149-1263/+2721
| | |\ \ \ \ \ \
| | * | | | | | | Added partitioner aware union, modified DStream.window.Tathagata Das2013-11-212-0/+92
| * | | | | | | | Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-sparkMatei Zaharia2014-01-022-6/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Removed redundant TaskSetManager.error() function.Kay Ousterhout2014-01-022-6/+1
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge pull request #311 from tmyklebu/masterMatei Zaharia2014-01-023-4/+38
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Factor call site reporting out to SparkContext.Tor Myklebust2013-12-283-4/+38
| * | | | | | | | Fixed two uses of conf.get with no default value in MesosMatei Zaharia2014-01-012-2/+2
| * | | | | | | | Miscellaneous fixes from code review.Matei Zaharia2014-01-0144-174/+195