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 2014/01/08 07:22:09 UTC
[07/13] git commit: Merge branch 'apache-master' into project-refactor
Merge branch 'apache-master' into project-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/977bcc36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/977bcc36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/977bcc36
Branch: refs/heads/master
Commit: 977bcc36d4440ff562d5dbcc12449bf383d0d9e2
Parents: 87b915f 50e3b8e
Author: Tathagata Das <ta...@gmail.com>
Authored: Tue Dec 31 00:43:38 2013 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Tue Dec 31 00:43:38 2013 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/TaskEndReason.scala | 2 -
.../spark/deploy/worker/ui/WorkerWebUI.scala | 6 +--
.../apache/spark/scheduler/DAGScheduler.scala | 44 +++++++++++++-------
.../org/apache/spark/scheduler/JobLogger.scala | 6 +--
.../scala/org/apache/spark/scheduler/Pool.scala | 4 --
.../apache/spark/scheduler/Schedulable.scala | 1 -
.../apache/spark/scheduler/SparkListener.scala | 20 +++++----
.../spark/scheduler/SparkListenerBus.scala | 2 +-
.../spark/scheduler/TaskSchedulerImpl.scala | 7 ----
.../apache/spark/scheduler/TaskSetManager.scala | 10 -----
.../spark/ui/jobs/JobProgressListener.scala | 11 ++---
.../apache/spark/scheduler/JobLoggerSuite.scala | 2 +-
.../spark/scheduler/SparkListenerSuite.scala | 2 +-
spark-class2.cmd | 2 +-
14 files changed, 52 insertions(+), 67 deletions(-)
----------------------------------------------------------------------