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/master Commit: c9cd2af71eae4126536db790ceaffe0587da7d89 Parents: 09e8be9 4e70480 Author: Prashant Sharma <[email protected]> Authored: Fri Dec 6 13:32:15 2013 +0530 Committer: Prashant Sharma <[email protected]> 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(-) ----------------------------------------------------------------------
