aboutsummaryrefslogtreecommitdiff
path: root/core/src/main
Commit message (Expand)AuthorAgeFilesLines
* 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-033-6/+6
|\
| * Merge pull request #317 from ScrapCodes/spark-915-segregate-scriptsPatrick Wendell2014-01-033-6/+6
| |\
| | * sbin/compute-classpath* bin/compute-classpath*Prashant Sharma2014-01-031-1/+1
| | * sbin/spark-class* -> bin/spark-class*Prashant Sharma2014-01-032-4/+4
| | * Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into s...Prashant Sharma2014-01-024-6/+6
| | |\
| | | * deprecate "spark" script and SPAKR_CLASSPATH environment variableAndrew xia2013-10-121-1/+1
| | | * Merge branch 'reorgscripts' into scripts-reorgshane-huang2013-09-274-6/+6
| | | |\
| | | | * 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-233-5/+5
* | | | | Changes on top of Prashant's patch.Patrick Wendell2014-01-031-1/+2
* | | | | fixed review commentsPrashant Sharma2014-01-031-1/+6
|/ / / /
* | | | 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-022-1/+111
|\ \ \ \
| * | | | Added Apache boilerplate and class docs to PartitionerAwareUnionRDD.Tathagata Das2013-12-261-3/+33
| * | | | Merge branch 'apache-master' into window-improvementTathagata Das2013-12-2620-1209/+909
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into window-improvementTathagata Das2013-12-2627-112/+287
| |\ \ \ \ \
| * | | | | | Fixed bug in PartitionAwareUnionRDDTathagata Das2013-12-261-6/+9
| * | | | | | Added tests for PartitionerAwareUnionRDD in the CheckpointSuite. Refactored C...Tathagata Das2013-12-202-14/+26
| * | | | | | Merge branch 'scheduler-update' into window-improvementTathagata Das2013-12-19117-1087/+1822
| |\ \ \ \ \ \
| * | | | | | | Added partitioner aware union, modified DStream.window.Tathagata Das2013-11-211-0/+65
* | | | | | | | 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-0141-163/+190
* | | | | | | | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2014-01-0110-19/+45
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'apache-github/master' into log4j-fix-2Patrick Wendell2014-01-0120-98/+270
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adding outer checkout when initializing loggingPatrick Wendell2013-12-311-3/+5
| * | | | | | | | | Tiny typo fixPatrick Wendell2013-12-311-2/+2
| * | | | | | | | | Minor fixesPatrick Wendell2013-12-302-3/+3
| * | | | | | | | | Removing initLogging entirelyPatrick Wendell2013-12-309-17/+21
| * | | | | | | | | Response to Shivaram's reviewPatrick Wendell2013-12-301-1/+1
| * | | | | | | | | SPARK-1008: Logging improvmentsPatrick Wendell2013-12-292-3/+23
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2014-01-015-1/+154
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #73 from falaki/ApproximateDistinctCountReynold Xin2013-12-315-1/+154
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Made the code more compact and readableHossein Falaki2013-12-313-23/+8
| | * | | | | | | | minor improvementsHossein Falaki2013-12-312-4/+5
| | * | | | | | | | Added Java API for countApproxDistinctHossein Falaki2013-12-301-0/+11
| | * | | | | | | | Added Java API for countApproxDistinctByKeyHossein Falaki2013-12-301-0/+36
| | * | | | | | | | Renamed countDistinct and countDistinctByKey methods to include ApproxHossein Falaki2013-12-302-6/+6