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 2014/01/02 21:57:51 UTC
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-spark
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-spark
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7bafb68d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7bafb68d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7bafb68d
Branch: refs/heads/master
Commit: 7bafb68d77fa156c0dd7541aeef14626f867726b
Parents: ca67909 5e67cdc
Author: Matei Zaharia <ma...@databricks.com>
Authored: Thu Jan 2 15:57:28 2014 -0500
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Thu Jan 2 15:57:28 2014 -0500
----------------------------------------------------------------------
.../scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala | 2 +-
.../main/scala/org/apache/spark/scheduler/TaskSetManager.scala | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------