You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/12/31 19:13:12 UTC
[09/16] git commit: Merge branch 'apache-master' into filestream-fix
Merge branch 'apache-master' into filestream-fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/9f79fd89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/9f79fd89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/9f79fd89
Branch: refs/heads/master
Commit: 9f79fd89dc84cda7ebeb98a0b43c8e982fefa787
Parents: 0af7f84 d63856c
Author: Tathagata Das <ta...@gmail.com>
Authored: Tue Dec 24 11:38:17 2013 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Tue Dec 24 11:38:17 2013 -0800
----------------------------------------------------------------------
.../org/apache/spark/MapOutputTracker.scala | 5 +-
.../org/apache/spark/api/java/JavaRDD.scala | 2 +
.../org/apache/spark/api/java/JavaRDDLike.scala | 11 +++
.../org/apache/spark/api/python/PythonRDD.scala | 4 -
.../org/apache/spark/deploy/client/Client.scala | 6 +-
.../org/apache/spark/deploy/master/Master.scala | 27 ++----
.../deploy/master/SparkZooKeeperSession.scala | 11 +--
.../master/ZooKeeperLeaderElectionAgent.scala | 4 +-
.../deploy/master/ui/ApplicationPage.scala | 14 ++-
.../spark/deploy/master/ui/IndexPage.scala | 16 ++--
.../spark/deploy/master/ui/MasterWebUI.scala | 10 +--
.../spark/deploy/worker/ui/IndexPage.scala | 4 +-
.../spark/deploy/worker/ui/WorkerWebUI.scala | 10 +--
.../org/apache/spark/executor/Executor.scala | 12 ++-
.../org/apache/spark/executor/TaskMetrics.scala | 5 ++
.../org/apache/spark/scheduler/TaskResult.scala | 20 ++---
.../cluster/CoarseGrainedSchedulerBackend.scala | 10 +--
.../spark/storage/BlockManagerMaster.scala | 7 +-
.../spark/storage/BlockManagerMasterActor.scala | 11 +--
.../org/apache/spark/ui/exec/ExecutorsUI.scala | 31 ++++++-
.../apache/spark/ui/jobs/ExecutorSummary.scala | 27 ++++++
.../apache/spark/ui/jobs/ExecutorTable.scala | 90 ++++++++++++++++++++
.../spark/ui/jobs/JobProgressListener.scala | 34 ++++++++
.../org/apache/spark/ui/jobs/StagePage.scala | 17 +++-
.../org/apache/spark/ui/jobs/StageTable.scala | 2 +-
.../spark/ui/storage/BlockManagerUI.scala | 3 -
.../scala/org/apache/spark/util/AkkaUtils.scala | 6 ++
.../scala/org/apache/spark/JavaAPISuite.java | 33 +++++++
.../cluster/ClusterTaskSetManagerSuite.scala | 3 +-
.../ui/jobs/JobProgressListenerSuite.scala | 73 ++++++++++++++++
project/SparkBuild.scala | 7 +-
python/pyspark/context.py | 3 -
python/pyspark/rdd.py | 10 ++-
run-example | 10 +++
sbt/sbt | 21 ++++-
spark-class | 10 +++
spark-shell | 19 ++++-
37 files changed, 465 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9f79fd89/core/src/test/scala/org/apache/spark/JavaAPISuite.java
----------------------------------------------------------------------