aboutsummaryrefslogtreecommitdiff
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Revert changes to examples/.../PageRankUtils.scalaAnkur Dave2014-01-091-3/+3
* Merge remote-tracking branch 'spark-upstream/master' into HEADAnkur Dave2014-01-0848-213/+295
|\
| * Merge pull request #313 from tdas/project-refactorPatrick Wendell2014-01-0710-41/+58
| |\
| | * Fixed examples/pom.xml and run-example based on Patrick's suggestions.Tathagata Das2014-01-071-6/+1
| | * Removed XYZFunctions and added XYZUtils as a common Scala and Java interface ...Tathagata Das2014-01-079-17/+14
| | * Merge remote-tracking branch 'apache/master' into project-refactorTathagata Das2014-01-0647-66/+77
| | |\
| | * | Changed JavaStreamingContextWith*** to ***Function in streaming.api.java.*** ...Tathagata Das2014-01-062-6/+6
| | * | Added pom.xml for external projects and removed unnecessary dependencies and ...Tathagata Das2013-12-311-15/+30
| | * | Refactored kafka, flume, zeromq, mqtt as separate external projects, with the...Tathagata Das2013-12-306-13/+20
| | * | Refactored streaming project to separate out the twitter functionality.Tathagata Das2013-12-263-1/+4
| * | | Add log4j exclusion rule to maven.Patrick Wendell2014-01-071-0/+3
| * | | Merge pull request #318 from srowen/masterReynold Xin2014-01-0714-85/+135
| |\ \ \
| | * | | Issue #318 : minor style updates per review from Reynold XinSean Owen2014-01-0710-33/+2
| | * | | Merge remote-tracking branch 'upstream/master'Sean Owen2014-01-0645-59/+63
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Suggested small changes to Java code for slightly more standard style, encaps...Sean Owen2014-01-0214-83/+164
| * | | | spark -> org.apache.sparkprabeesh2014-01-078-12/+12
| | |/ / | |/| |
| * | | Removing SPARK_EXAMPLES_JAR in the codePatrick Wendell2014-01-0544-44/+48
| * | | run-example -> bin/run-examplePrashant Sharma2014-01-0210-15/+15
| |/ /
| * | Merge remote-tracking branch 'origin/master' into conf2Matei Zaharia2013-12-291-1/+1
| |\|
| | * Fixed job name in the java streaming example.azuryyu2013-12-241-1/+1
| * | Various fixes to configuration codeMatei Zaharia2013-12-282-4/+4
| * | spark-544, introducing SparkConf and related configuration overhaul.Prashant Sharma2013-12-253-7/+14
| |/
| * Use scala.binary.version in POMsMark Hamstra2013-12-151-10/+10
| * Fix maven build issues in 2.10 branchPatrick Wendell2013-12-131-1/+1
| * Style fixes and addressed review comments at #221Prashant Sharma2013-12-101-10/+10
| * Incorporated Patrick's feedback comment on #211 and made maven build/dep-reso...Prashant Sharma2013-12-071-1/+1
| * Merge branch 'master' of github.com:apache/incubator-spark into scala-2.10-tempPrashant Sharma2013-11-216-16/+19
| |\
| * \ Merge branch 'scala210-master' of github.com:colorant/incubator-spark into sc...Prashant Sharma2013-11-219-30/+274
| |\ \
| | * \ Merge branch 'master' into scala-2.10Raymond Liu2013-11-139-30/+274
| | |\ \
| * | | | Remove deprecated actorFor and use actorSelection everywhere.Prashant Sharma2013-11-121-1/+1
| |/ / /
| * | | Merge branch 'scala-2.10' of github.com:ScrapCodes/spark into scala-2.10Prashant Sharma2013-10-101-7/+21
| |\ \ \
| | * \ \ Merge branch 'master' into wip-merge-masterPrashant Sharma2013-10-081-6/+20
| | |\ \ \
| | * \ \ \ Merge branch 'master' into scala-2.10Prashant Sharma2013-10-011-1/+1
| | |\ \ \ \
| * | | | | | fixed some warningsMartin Weindel2013-10-054-5/+3
| |/ / / / /
| * | | | | Sync with master and some build fixesPrashant Sharma2013-09-261-1/+1
| |\ \ \ \ \
| * | | | | | fixed maven build for scala 2.10Prashant Sharma2013-09-261-5/+5
| * | | | | | Akka 2.2 migrationPrashant Sharma2013-09-222-4/+6
| * | | | | | Merge branch 'master' of git://github.com/mesos/spark into scala-2.10Prashant Sharma2013-09-151-14/+0
| |\| | | | |
| * | | | | | Merged with masterPrashant Sharma2013-09-0659-494/+2086
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into master-mergePrashant Sharma2013-07-121-0/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into master-mergePrashant Sharma2013-07-039-18/+395
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix run script on Windows for Scala 2.10Matei Zaharia2013-06-151-1/+2
| * | | | | | | | | Fixed Warning: ClassManifest -> ClassTagPrashant Sharma2013-04-291-1/+2
| * | | | | | | | | Fixed pom.xml with updated dependencies.Prashant Sharma2013-04-291-1/+1
* | | | | | | | | | Merge branch 'master' of github.com:apache/incubator-sparkReynold Xin2013-11-256-16/+19
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into removesemicolonscalaHenry Saputra2013-11-192-11/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable the Broadcast examples to work in a cluster settingAaron Davidson2013-11-182-11/+14
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * / | | | | | | | Remove the semicolons at the end of Scala code to make it more pure Scala code.Henry Saputra2013-11-194-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' of github.com:apache/incubator-spark into mergemergeReynold Xin2013-11-041-1/+2
|\| | | | | | | |
| * | | | | | | | fix sparkhdfs lr testtgravescs2013-10-291-1/+2