aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'spark/master'Andrew Or2014-01-02182-1764/+3172
|\
| * 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
| |\ \
| | * | Added Apache boilerplate and class docs to PartitionerAwareUnionRDD.Tathagata Das2013-12-261-3/+33
| | * | Removed unncessary options from WindowedDStream.Tathagata Das2013-12-261-5/+3
| | * | Merge branch 'apache-master' into window-improvementTathagata Das2013-12-2650-1548/+1841
| | |\ \
| | * \ \ Merge branch 'master' into window-improvementTathagata Das2013-12-2637-123/+465
| | |\ \ \
| | * | | | Updated groupByKeyAndWindow to be computed incrementally, and added mapSideCo...Tathagata Das2013-12-265-12/+34
| | * | | | Fixed bug in PartitionAwareUnionRDDTathagata Das2013-12-261-6/+9
| | * | | | Merge branch 'scheduler-update' into window-improvementTathagata Das2013-12-234-5/+32
| | |\ \ \ \
| | * | | | | Added tests for PartitionerAwareUnionRDD in the CheckpointSuite. Refactored C...Tathagata Das2013-12-203-170/+231
| | * | | | | Merge branch 'scheduler-update' into window-improvementTathagata Das2013-12-19306-4277/+10714
| | |\ \ \ \ \
| | * | | | | | Added flag in window operation to use partition awaare union.Tathagata Das2013-11-211-1/+3
| | * | | | | | Added partitioner aware union, modified DStream.window.Tathagata Das2013-11-213-39/+94
| | * | | | | | Added partition aware union to improve reduceByKeyAndWindowTathagata Das2013-11-201-2/+49
| * | | | | | | Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-sparkMatei Zaharia2014-01-022-6/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #319 from kayousterhout/remove_error_methodReynold Xin2014-01-022-6/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Removed redundant TaskSetManager.error() function.Kay Ousterhout2014-01-022-6/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #311 from tmyklebu/masterMatei Zaharia2014-01-024-15/+93
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Make Python function/line appear in the UI.Tor Myklebust2013-12-281-11/+55
| | * | | | | | Factor call site reporting out to SparkContext.Tor Myklebust2013-12-283-4/+38
| * | | | | | | Merge pull request #309 from mateiz/conf2Patrick Wendell2014-01-01140-941/+1731
| |\ \ \ \ \ \ \
| | * | | | | | | Fix Python code after change of getOrElseMatei Zaharia2014-01-012-7/+14
| | * | | | | | | 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-0149-189/+206
| | * | | | | | | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2014-01-0119-37/+52
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #312 from pwendell/log4j-fix-2Patrick Wendell2014-01-0119-37/+52
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'apache-github/master' into log4j-fix-2Patrick Wendell2014-01-0138-465/+803
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Adding outer checkout when initializing loggingPatrick Wendell2013-12-311-3/+5
| | * | | | | | | | Tiny typo fixPatrick Wendell2013-12-311-2/+2
| | * | | | | | | | Removing use in testPatrick Wendell2013-12-311-2/+0
| | * | | | | | | | Minor fixesPatrick Wendell2013-12-302-3/+3
| | * | | | | | | | Removing initLogging entirelyPatrick Wendell2013-12-3017-32/+21
| | * | | | | | | | Response to Shivaram's reviewPatrick Wendell2013-12-302-15/+18
| | * | | | | | | | SPARK-1008: Logging improvmentsPatrick Wendell2013-12-294-13/+37
| | | * | | | | | | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2014-01-0112-211/+457
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #314 from witgo/masterReynold Xin2013-12-312-1356/+240
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | restore core/pom.xml file modificationliguoqiang2014-01-012-1356/+240
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #73 from falaki/ApproximateDistinctCountReynold Xin2013-12-3112-233/+1595
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Made the code more compact and readableHossein Falaki2013-12-313-23/+8
| | * | | | | | | | | minor improvementsHossein Falaki2013-12-312-4/+5
| | * | | | | | | | | Added Java unit tests for countApproxDistinct and countApproxDistinctByKeyHossein Falaki2013-12-301-0/+32
| | * | | | | | | | | Added Java API for countApproxDistinctHossein Falaki2013-12-301-0/+11
| | * | | | | | | | | Added Java API for countApproxDistinctByKeyHossein Falaki2013-12-301-0/+36
| | * | | | | | | | | Added stream 2.5.1 jar depenencyHossein Falaki2013-12-301-1/+2
| | * | | | | | | | | Renamed countDistinct and countDistinctByKey methods to include ApproxHossein Falaki2013-12-305-15/+15