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/12 08:11:45 UTC

[14/50] git commit: Merge branch 'wip-scala-2.10' into akka-bug-fix

Merge branch 'wip-scala-2.10' into akka-bug-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/c9cd2af7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c9cd2af7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c9cd2af7

Branch: refs/heads/scala-2.10
Commit: c9cd2af71eae4126536db790ceaffe0587da7d89
Parents: 09e8be9 4e70480
Author: Prashant Sharma <pr...@imaginea.com>
Authored: Fri Dec 6 13:32:15 2013 +0530
Committer: Prashant Sharma <pr...@imaginea.com>
Committed: Fri Dec 6 13:32:15 2013 +0530

----------------------------------------------------------------------
 .../org/apache/spark/scheduler/cluster/SimrSchedulerBackend.scala  | 2 +-
 .../main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------