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:06 UTC

[03/16] git commit: Merge branch 'scheduler-update' into filestream-fix

Merge branch 'scheduler-update' 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/d91ec6f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d91ec6f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d91ec6f8

Branch: refs/heads/master
Commit: d91ec6f8ea3ab6683af92eddfedd9ea6c0710f00
Parents: 984c582 3ddbdbf
Author: Tathagata Das <ta...@gmail.com>
Authored: Sun Dec 22 15:23:35 2013 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Sun Dec 22 15:23:35 2013 -0800

----------------------------------------------------------------------
 .../org/apache/spark/streaming/scheduler/JobScheduler.scala      | 4 +++-
 .../main/scala/org/apache/spark/streaming/scheduler/JobSet.scala | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------