aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | | | | Using origin versionHossein Falaki2013-12-30374-8424/+19051
| |\ \ \ \ \
| * | | | | | Removed superfluous abs call from test cases.Hossein Falaki2013-12-101-2/+2
| * | | | | | Made SerializableHyperLogLog Externalizable and added Kryo testsHossein Falaki2013-10-182-5/+10
| * | | | | | Added stream-lib dependency to Maven buildHossein Falaki2013-10-182-0/+9
| * | | | | | Improved code style.Hossein Falaki2013-10-174-15/+19
| * | | | | | Fixed document typoHossein Falaki2013-10-172-4/+4
| * | | | | | Added dependency on stream-lib version 2.4.0 for approximate distinct count s...Hossein Falaki2013-10-171-1/+2
| * | | | | | Added countDistinctByKey to PairRDDFunctions that counts the approximate numb...Hossein Falaki2013-10-172-0/+81
| * | | | | | Added a countDistinct method to RDD that takes takes an accuracy parameter an...Hossein Falaki2013-10-172-1/+38
| * | | | | | Added a serializable wrapper for HyperLogLogHossein Falaki2013-10-171-0/+44
| | | | * | | Fix two compile errors introduced in mergeMatei Zaharia2013-12-312-2/+2
| | | | * | | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2013-12-3130-259/+347
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #238 from ngbinh/upgradeNettyPatrick Wendell2013-12-318-44/+60
|\ \ \ \ \ \ \
| * | | | | | | Fix failed unit testsBinh Nguyen2013-12-273-13/+24
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 23:03:05 +0000