spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [1/4] git commit: Merge pull request #1 from apache/master
Date Wed, 08 Jan 2014 05:32:23 GMT
Updated Branches:
  refs/heads/master 7d0aac917 -> 11891e68c


Merge pull request #1 from apache/master

Merge latest Spark changes

Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/87248bdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/87248bdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/87248bdd

Branch: refs/heads/master
Commit: 87248bddac85f4ce755f35b2375757eb8c240011
Parents: 3713f81 30b9db0
Author: Luca Rosellini <luca.rosellini@gmail.com>
Authored: Fri Jan 3 00:45:31 2014 -0800
Committer: Luca Rosellini <luca.rosellini@gmail.com>
Committed: Fri Jan 3 00:45:31 2014 -0800

----------------------------------------------------------------------
 assembly/pom.xml                                |  12 +-
 .../scala/org/apache/spark/SparkContext.scala   |  26 +-
 .../spark/api/java/JavaSparkContext.scala       |  14 +
 .../org/apache/spark/executor/Executor.scala    |  24 +-
 .../spark/rdd/PartitionerAwareUnionRDD.scala    | 110 +++
 .../main/scala/org/apache/spark/rdd/RDD.scala   |   2 +-
 .../apache/spark/rdd/RDDCheckpointData.scala    |   2 +-
 .../spark/scheduler/TaskSchedulerImpl.scala     |   5 +-
 .../apache/spark/scheduler/TaskSetManager.scala |   5 -
 .../org/apache/spark/CheckpointSuite.scala      | 361 +++++-----
 .../scala/org/apache/spark/rdd/RDDSuite.scala   |  27 +
 docs/building-with-maven.md                     |  14 +-
 docs/running-on-yarn.md                         |   3 -
 new-yarn/pom.xml                                | 161 -----
 .../spark/deploy/yarn/ApplicationMaster.scala   | 446 ------------
 .../yarn/ApplicationMasterArguments.scala       |  94 ---
 .../org/apache/spark/deploy/yarn/Client.scala   | 521 --------------
 .../spark/deploy/yarn/ClientArguments.scala     | 149 ----
 .../yarn/ClientDistributedCacheManager.scala    | 228 ------
 .../spark/deploy/yarn/WorkerLauncher.scala      | 222 ------
 .../spark/deploy/yarn/WorkerRunnable.scala      | 209 ------
 .../deploy/yarn/YarnAllocationHandler.scala     | 687 ------------------
 .../spark/deploy/yarn/YarnSparkHadoopUtil.scala |  43 --
 .../cluster/YarnClientClusterScheduler.scala    |  48 --
 .../cluster/YarnClientSchedulerBackend.scala    | 110 ---
 .../cluster/YarnClusterScheduler.scala          |  56 --
 .../ClientDistributedCacheManagerSuite.scala    | 220 ------
 pom.xml                                         |  59 +-
 project/SparkBuild.scala                        |  32 +-
 python/pyspark/rdd.py                           |  66 +-
 .../spark/streaming/PairDStreamFunctions.scala  |  13 +-
 .../streaming/api/java/JavaPairDStream.scala    |  18 +-
 .../streaming/dstream/ShuffledDStream.scala     |   9 +-
 .../streaming/dstream/WindowedDStream.scala     |  16 +-
 .../spark/streaming/WindowOperationsSuite.scala |   4 +-
 yarn/README.md                                  |  12 +
 yarn/alpha/pom.xml                              |  32 +
 .../spark/deploy/yarn/ApplicationMaster.scala   | 458 ++++++++++++
 .../org/apache/spark/deploy/yarn/Client.scala   | 505 ++++++++++++++
 .../spark/deploy/yarn/WorkerLauncher.scala      | 248 +++++++
 .../spark/deploy/yarn/WorkerRunnable.scala      | 235 +++++++
 .../deploy/yarn/YarnAllocationHandler.scala     | 680 ++++++++++++++++++
 .../yarn/ApplicationMasterArguments.scala       |  94 +++
 .../spark/deploy/yarn/ClientArguments.scala     | 150 ++++
 .../yarn/ClientDistributedCacheManager.scala    | 228 ++++++
 .../spark/deploy/yarn/YarnSparkHadoopUtil.scala |  43 ++
 .../cluster/YarnClientClusterScheduler.scala    |  48 ++
 .../cluster/YarnClientSchedulerBackend.scala    | 110 +++
 .../cluster/YarnClusterScheduler.scala          |  56 ++
 .../ClientDistributedCacheManagerSuite.scala    | 220 ++++++
 yarn/pom.xml                                    |  84 ++-
 .../spark/deploy/yarn/ApplicationMaster.scala   | 477 -------------
 .../yarn/ApplicationMasterArguments.scala       |  94 ---
 .../org/apache/spark/deploy/yarn/Client.scala   | 505 --------------
 .../spark/deploy/yarn/ClientArguments.scala     | 146 ----
 .../yarn/ClientDistributedCacheManager.scala    | 228 ------
 .../spark/deploy/yarn/WorkerLauncher.scala      | 243 -------
 .../spark/deploy/yarn/WorkerRunnable.scala      | 235 -------
 .../deploy/yarn/YarnAllocationHandler.scala     | 673 ------------------
 .../spark/deploy/yarn/YarnSparkHadoopUtil.scala |  43 --
 .../cluster/YarnClientClusterScheduler.scala    |  48 --
 .../cluster/YarnClientSchedulerBackend.scala    | 110 ---
 .../cluster/YarnClusterScheduler.scala          |  59 --
 .../ClientDistributedCacheManagerSuite.scala    | 220 ------
 yarn/stable/pom.xml                             |  32 +
 .../spark/deploy/yarn/ApplicationMaster.scala   | 428 ++++++++++++
 .../org/apache/spark/deploy/yarn/Client.scala   | 523 ++++++++++++++
 .../spark/deploy/yarn/WorkerLauncher.scala      | 227 ++++++
 .../spark/deploy/yarn/WorkerRunnable.scala      | 209 ++++++
 .../deploy/yarn/YarnAllocationHandler.scala     | 694 +++++++++++++++++++
 70 files changed, 5828 insertions(+), 6585 deletions(-)
----------------------------------------------------------------------



Mime
View raw message