You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/09/21 00:07:10 UTC

[50/50] git commit: Merge branch 'master' of github.com:mesos/spark

Merge branch 'master' of github.com:mesos/spark


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

Branch: refs/heads/master
Commit: 119de80294bd0cb82855bd1982c5371b661b6fd5
Parents: a106ed8 cd7222c
Author: Reynold Xin <re...@gmail.com>
Authored: Fri Sep 20 15:03:55 2013 -0700
Committer: Reynold Xin <re...@gmail.com>
Committed: Fri Sep 20 15:03:55 2013 -0700

----------------------------------------------------------------------
 assembly/README                                 |  11 +-
 assembly/pom.xml                                |   6 +
 conf/fairscheduler.xml.template                 |  18 +-
 conf/metrics.properties.template                |  50 ++-
 core/pom.xml                                    |   9 +
 .../scala/org/apache/spark/CacheManager.scala   |   8 +-
 .../scala/org/apache/spark/SparkContext.scala   |  25 +-
 .../main/scala/org/apache/spark/SparkEnv.scala  |   2 +-
 .../scala/org/apache/spark/TaskContext.scala    |   1 +
 .../org/apache/spark/deploy/DeployMessage.scala |   4 +
 .../org/apache/spark/deploy/JsonProtocol.scala  |   4 +-
 .../apache/spark/deploy/LocalSparkCluster.scala |   2 +-
 .../org/apache/spark/deploy/master/Master.scala |  21 +-
 .../org/apache/spark/executor/Executor.scala    |   2 +-
 .../apache/spark/executor/ExecutorSource.scala  |   5 +-
 .../apache/spark/metrics/MetricsConfig.scala    |   7 +-
 .../apache/spark/metrics/sink/GangliaSink.scala |  82 +++++
 .../spark/metrics/sink/MetricsServlet.scala     |  11 +-
 .../spark/network/netty/ShuffleSender.scala     |   3 +-
 .../main/scala/org/apache/spark/rdd/RDD.scala   |  17 +
 .../apache/spark/scheduler/DAGScheduler.scala   |  12 +-
 .../spark/scheduler/DAGSchedulerSource.scala    |   6 +-
 .../org/apache/spark/scheduler/ResultTask.scala |   6 +-
 .../apache/spark/scheduler/ShuffleMapTask.scala |   2 +-
 .../scheduler/cluster/ClusterScheduler.scala    |   2 +-
 .../cluster/ClusterTaskSetManager.scala         |   4 +-
 .../scheduler/cluster/SchedulableBuilder.scala  |   6 +-
 .../cluster/SparkDeploySchedulerBackend.scala   |  12 +-
 .../spark/scheduler/local/LocalScheduler.scala  |   2 +-
 .../spark/storage/BlockManagerSource.scala      |   6 +-
 .../org/apache/spark/storage/DiskStore.scala    |   2 +-
 .../org/apache/spark/storage/StorageLevel.scala |   6 +-
 .../scala/org/apache/spark/ui/SparkUI.scala     |   7 +-
 .../scala/org/apache/spark/ui/UIUtils.scala     |  39 ++-
 .../apache/spark/ui/UIWorkloadGenerator.scala   |   4 +-
 .../spark/ui/jobs/JobProgressListener.scala     |   2 +-
 .../org/apache/spark/ui/jobs/PoolTable.scala    |   3 +-
 .../org/apache/spark/ui/jobs/StageTable.scala   |   7 +-
 .../org/apache/spark/ui/storage/IndexPage.scala |   2 +-
 .../scala/org/apache/spark/util/Utils.scala     |  26 +-
 .../org/apache/spark/CacheManagerSuite.scala    |  91 ++++++
 .../scala/org/apache/spark/JavaAPISuite.java    |   2 +-
 .../apache/spark/deploy/JsonProtocolSuite.scala |  92 ++++++
 .../spark/metrics/MetricsConfigSuite.scala      |  19 +-
 .../scala/org/apache/spark/rdd/RDDSuite.scala   |  14 +-
 .../cluster/ClusterSchedulerSuite.scala         |   8 +-
 .../scheduler/local/LocalSchedulerSuite.scala   |   8 +-
 .../scala/org/apache/spark/ui/UISuite.scala     |   2 +-
 docs/_config.yml                                |   2 +-
 docs/_layouts/global.html                       |   9 +-
 docs/building-with-maven.md                     |   6 +-
 docs/cluster-overview.md                        | 117 +++++++
 docs/configuration.md                           |  34 +-
 docs/contributing-to-spark.md                   |  24 +-
 docs/ec2-scripts.md                             |   8 +-
 docs/hadoop-third-party-distributions.md        | 118 +++++++
 docs/hardware-provisioning.md                   |   4 +-
 docs/img/cluster-overview.png                   | Bin 0 -> 28011 bytes
 docs/img/cluster-overview.pptx                  | Bin 0 -> 51771 bytes
 docs/img/spark-logo-hd.png                      | Bin 0 -> 13512 bytes
 docs/index.md                                   |  26 +-
 docs/job-scheduling.md                          | 168 ++++++++++
 docs/mllib-guide.md                             | 192 ++++++++++-
 docs/monitoring.md                              |  70 ++++
 docs/python-programming-guide.md                |  14 +-
 docs/quick-start.md                             |  70 ++--
 docs/running-on-mesos.md                        |  48 ++-
 docs/running-on-yarn.md                         |  35 +-
 docs/scala-programming-guide.md                 |   4 +-
 docs/spark-standalone.md                        |  46 ++-
 .../root/spark-ec2/ec2-variables.sh             |  17 +
 ec2/spark_ec2.py                                |  11 +-
 examples/pom.xml                                |  14 -
 make-distribution.sh                            |   2 +-
 mllib/data/sample_svm_data.txt                  | 322 +++++++++++++++++++
 .../apache/spark/mllib/classification/SVM.scala |  13 +-
 .../mllib/regression/LinearRegression.scala     |   4 +-
 pom.xml                                         | 236 +++++++-------
 project/SparkBuild.scala                        |  17 +-
 project/project/SparkPluginBuild.scala          |  19 +-
 python/pyspark/__init__.py                      |   5 +-
 python/pyspark/context.py                       |  11 +
 python/pyspark/rdd.py                           |  19 ++
 python/pyspark/shell.py                         |   1 +
 python/pyspark/storagelevel.py                  |  43 +++
 repl-bin/pom.xml                                |  10 -
 repl/pom.xml                                    |  12 -
 run-example                                     |   8 +-
 yarn/pom.xml                                    |  66 ++--
 .../spark/deploy/yarn/ApplicationMaster.scala   |  78 +++--
 .../yarn/ApplicationMasterArguments.scala       |   2 +-
 .../org/apache/spark/deploy/yarn/Client.scala   |   5 +-
 .../spark/deploy/yarn/ClientArguments.scala     |   2 +-
 .../spark/deploy/yarn/WorkerRunnable.scala      |   3 +-
 .../deploy/yarn/YarnAllocationHandler.scala     |  13 +-
 .../cluster/YarnClusterScheduler.scala          |   3 +
 96 files changed, 2068 insertions(+), 543 deletions(-)
----------------------------------------------------------------------