Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #265 from markhamstra/scala.binary.version | Patrick Wendell | 2013-12-15 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | DRY out the POMs with scala.binary.version ...instead of hard-coding 2.10 repeatedly. As long as it's not a `<project>`-level `<artifactId>`, I think that we are okay parameterizing these. | ||||
| * | Use scala.binary.version in POMs | Mark Hamstra | 2013-12-15 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #257 from tgravescs/sparkYarnFixName | Reynold Xin | 2013-12-15 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | | | Fix the --name option for Spark on Yarn Looks like the --name option accidentally got broken in one of the merges. The Client hangs if the --name option is used right now. | ||||
| * | Fix the --name option for Spark on Yarn | Thomas Graves | 2013-12-12 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into akka-bug-fix | Prashant Sharma | 2013-12-11 | 4 | -309/+445 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: core/pom.xml core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala pom.xml project/SparkBuild.scala streaming/pom.xml yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala | ||||
| * | Merge remote-tracking branch 'origin/master' into yarn-2.2 | Harvey Feng | 2013-11-26 | 5 | -19/+433 |
| |\ | | | | | | | | | | | | | Conflicts: yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala | ||||
| * | | A few more style fixes in `yarn` package. | Harvey Feng | 2013-11-23 | 3 | -45/+71 |
| | | | |||||
| * | | Merge branch 'master' into yarn-cleanup | Harvey Feng | 2013-11-21 | 6 | -51/+81 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala yarn/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala | ||||
| * | | | Misc style changes in the 'yarn' package. | Harvey Feng | 2013-11-17 | 4 | -273/+376 |
| | | | | |||||
* | | | | Style fixes and addressed review comments at #221 | Prashant Sharma | 2013-12-10 | 1 | -4/+4 |
| | | | | |||||
* | | | | fixed yarn build | Prashant Sharma | 2013-12-09 | 2 | -11/+8 |
| | | | | |||||
* | | | | Incorporated Patrick's feedback comment on #211 and made maven ↵ | Prashant Sharma | 2013-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | build/dep-resolution atleast a bit faster. | ||||
* | | | | A left over akka -> akka.tcp changes | Prashant Sharma | 2013-12-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into wip-scala-2.10 | Prashant Sharma | 2013-11-27 | 5 | -21/+434 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala core/src/main/scala/org/apache/spark/rdd/MapPartitionsRDD.scala core/src/main/scala/org/apache/spark/rdd/MapPartitionsWithContextRDD.scala core/src/main/scala/org/apache/spark/rdd/RDD.scala python/pyspark/rdd.py | ||||
| * | | | Add YarnClientClusterScheduler and Backend. | Raymond Liu | 2013-11-22 | 5 | -21/+434 |
| | |/ | |/| | | | | | | | | | | | | | | | | With this scheduler, the user application is launched locally, While the executor will be launched by YARN on remote nodes. This enables spark-shell to run upon YARN. | ||||
* | | | Merge branch 'master' of github.com:apache/incubator-spark into scala-2.10-temp | Prashant Sharma | 2013-11-21 | 7 | -68/+90 |
|\| | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/util/collection/PrimitiveVector.scala streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala | ||||
| * | | Merge branch 'master' into removesemicolonscala | Henry Saputra | 2013-11-19 | 3 | -29/+58 |
| |\ \ | |||||
| | * | | Impove Spark on Yarn Error handling | tgravescs | 2013-11-19 | 3 | -29/+58 |
| | |/ | |||||
| * | | Another set of changes to remove unnecessary semicolon (;) from Scala code. | Henry Saputra | 2013-11-19 | 4 | -5/+5 |
| | | | | | | | | | | | | Passed the sbt/sbt compile and test | ||||
| * | | Remove the semicolons at the end of Scala code to make it more pure Scala code. | Henry Saputra | 2013-11-19 | 5 | -26/+21 |
| |/ | | | | | | | | | | | | | Also remove unused imports as I found them along the way. Remove return statements when returning value in the Scala code. Passing compile and tests. | ||||
| * | Simple cleanup on Spark's Scala code while testing core and yarn modules: | Henry Saputra | 2013-11-15 | 4 | -8/+6 |
| | | | | | | | | | | | | -) Remove some of unused imports as I found them -) Remove ";" in the imports statements -) Remove () at the end of method call like size that does not have size effect. | ||||
* | | Merge branch 'master' into scala-2.10 | Raymond Liu | 2013-11-14 | 6 | -172/+646 |
|\| | |||||
| * | Allow spark on yarn to be run from HDFS. Allows the spark.jar, app.jar, and ↵ | tgravescs | 2013-11-04 | 6 | -172/+646 |
| | | | | | | | | log4j.properties to be put into hdfs. | ||||
* | | Merge branch 'master' into scala-2.10 | Raymond Liu | 2013-11-13 | 5 | -51/+278 |
|\| | |||||
| * | Fix the Worker to use CoarseGrainedExecutorBackend and modify classpath to ↵ | tgravescs | 2013-10-21 | 2 | -10/+29 |
| | | | | | | | | | | | | be explicit about inclusion of spark.jar and app.jar | ||||
| * | Fix yarn build | tgravescs | 2013-10-16 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'tgravescs/sparkYarnDistCache' | Matei Zaharia | 2013-10-10 | 4 | -45/+253 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Closes #11 Conflicts: docs/running-on-yarn.md yarn/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala | ||||
| | * | Adding in the --addJars option to make SparkContext.addJar work on yarn and ↵ | tgravescs | 2013-10-03 | 3 | -20/+34 |
| | | | | | | | | | | | | | | | | | | cleanup the classpaths | ||||
| | * | Support distributed cache files and archives on spark on yarn and attempt to ↵ | Y.CORP.YAHOO.COM\tgraves | 2013-09-23 | 4 | -29/+226 |
| | | | | | | | | | | | | cleanup the staging directory on exit | ||||
* | | | Merge branch 'master' into wip-merge-master | Prashant Sharma | 2013-10-08 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bagel/pom.xml core/pom.xml core/src/test/scala/org/apache/spark/ui/UISuite.scala examples/pom.xml mllib/pom.xml pom.xml project/SparkBuild.scala repl/pom.xml streaming/pom.xml tools/pom.xml In scala 2.10, a shorter representation is used for naming artifacts so changed to shorter scala version for artifacts and made it a property in pom. | ||||
| * | | Merging build changes in from 0.8 | Patrick Wendell | 2013-10-05 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into scala-2.10 | Prashant Sharma | 2013-10-05 | 2 | -1/+7 |
|\| | | | | | | | | | | | | | | | | | Conflicts: core/src/test/scala/org/apache/spark/DistributedSuite.scala project/SparkBuild.scala | ||||
| * | | Add default value to usage statement | tgravescs | 2013-10-03 | 1 | -1/+1 |
| | | | |||||
| * | | Allow users to set the application name for Spark on Yarn | tgravescs | 2013-10-02 | 2 | -1/+7 |
| | | | |||||
* | | | Merge branch 'master' into scala-2.10 | Prashant Sharma | 2013-10-01 | 3 | -5/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/ui/jobs/JobProgressUI.scala docs/_config.yml project/SparkBuild.scala repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala | ||||
| * | | Update build version in master | Patrick Wendell | 2013-09-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fix spacing so that the java.io.tmpdir doesn't run on with SPARK_JAVA_OPTS | Y.CORP.YAHOO.COM\tgraves | 2013-09-23 | 2 | -4/+6 |
| |/ | |||||
* | | fixed maven build for scala 2.10 | Prashant Sharma | 2013-09-26 | 1 | -2/+2 |
| | | |||||
* | | Akka 2.2 migration | Prashant Sharma | 2013-09-22 | 1 | -1/+1 |
|/ | |||||
* | Use different Hadoop version for YARN artifacts. | Patrick Wendell | 2013-09-13 | 1 | -0/+5 |
| | | | | | This uses a seperate Hadoop version for YARN artifact. This means when people link against spark-yarn, things will resolve correctly. | ||||
* | Fix YARN assembly generation under Maven | Jey Kottalam | 2013-09-06 | 1 | -33/+28 |
| | |||||
* | Review comment changes and update to org.apache packaging | Y.CORP.YAHOO.COM\tgraves | 2013-09-03 | 7 | -15/+18 |
| | |||||
* | Merge remote-tracking branch 'mesos/master' into yarnUILink | Y.CORP.YAHOO.COM\tgraves | 2013-09-03 | 9 | -29/+29 |
|\ | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/ui/UIUtils.scala core/src/main/scala/org/apache/spark/ui/jobs/PoolTable.scala core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala docs/running-on-yarn.md | ||||
| * | Add missing license headers found with RAT | Matei Zaharia | 2013-09-02 | 1 | -2/+2 |
| | | |||||
| * | Fix some URLs | Matei Zaharia | 2013-09-01 | 1 | -1/+1 |
| | | |||||
| * | Initial work to rename package to org.apache.spark | Matei Zaharia | 2013-09-01 | 9 | -26/+26 |
| | | |||||
* | | Link the Spark UI to the Yarn UI | Y.CORP.YAHOO.COM\tgraves | 2013-08-30 | 3 | -18/+57 |
|/ | |||||
* | Merge pull request #865 from tgravescs/fixtmpdir | Matei Zaharia | 2013-08-28 | 3 | -0/+26 |
|\ | | | | | Spark on Yarn should use yarn approved directories for spark.local.dir and tmp | ||||
| * | Updated based on review comments. | Y.CORP.YAHOO.COM\tgraves | 2013-08-27 | 1 | -9/+6 |
| | | |||||
| * | Throw exception if the yarn local dirs isn't set | Y.CORP.YAHOO.COM\tgraves | 2013-08-26 | 1 | -1/+5 |
| | |