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/13 21:18:22 UTC
[5/9] git commit: Merge remote-tracking branch 'apache/master' into
dstream-move
Merge remote-tracking branch 'apache/master' into dstream-move
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/74d01262
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/74d01262
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/74d01262
Branch: refs/heads/master
Commit: 74d0126257838f29e3fad519b9f1a5acde88bef6
Parents: d1820fe 074f502
Author: Tathagata Das <ta...@gmail.com>
Authored: Sun Jan 12 18:02:05 2014 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Sun Jan 12 18:02:05 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/executor/Executor.scala | 2 +-
.../org/apache/spark/scheduler/DAGScheduler.scala | 4 +++-
.../org/apache/spark/scheduler/SparkListener.scala | 3 +++
.../apache/spark/scheduler/SparkListenerBus.scala | 15 +++++++++++----
4 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------