You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spark.apache.org by ma...@apache.org on 2013/10/19 05:31:14 UTC

[08/13] git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: 6a84e40efe9aa2a48e35fb703c102a605a8d2ca3
Parents: 35b2415 cf64f63
Author: Mosharaf Chowdhury <mo...@cs.berkeley.edu>
Authored: Thu Oct 17 13:14:33 2013 -0700
Committer: Mosharaf Chowdhury <mo...@cs.berkeley.edu>
Committed: Thu Oct 17 13:14:33 2013 -0700

----------------------------------------------------------------------
 .../apache/spark/scheduler/DAGScheduler.scala   | 14 +++---
 .../apache/spark/scheduler/TaskScheduler.scala  |  7 ++-
 .../spark/scheduler/TaskSchedulerListener.scala | 44 ------------------
 .../scheduler/cluster/ClusterScheduler.scala    | 14 +++---
 .../cluster/ClusterTaskSetManager.scala         | 21 +++++----
 .../spark/scheduler/local/LocalScheduler.scala  |  6 +--
 .../scheduler/local/LocalTaskSetManager.scala   | 11 +++--
 .../spark/scheduler/DAGSchedulerSuite.scala     |  2 +-
 .../cluster/ClusterTaskSetManagerSuite.scala    | 49 ++++++++++----------
 9 files changed, 63 insertions(+), 105 deletions(-)
----------------------------------------------------------------------