diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-12-06 13:32:15 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-12-06 13:32:15 +0530 |
| commit | c9cd2af71eae4126536db790ceaffe0587da7d89 (patch) | |
| tree | e5ed6be8fadb775ec5b3caf20e2a350bf2b48c6a /core | |
| parent | 09e8be9a6225203337a01e618851e807a1482603 (diff) | |
| parent | 4e70480038e9654426876e8e6b2fc356b7f0c8ca (diff) | |
| download | spark-c9cd2af71eae4126536db790ceaffe0587da7d89.tar.gz spark-c9cd2af71eae4126536db790ceaffe0587da7d89.tar.bz2 spark-c9cd2af71eae4126536db790ceaffe0587da7d89.zip | |
Merge branch 'wip-scala-2.10' into akka-bug-fix
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/cluster/SimrSchedulerBackend.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/SimrSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/SimrSchedulerBackend.scala index e000531a26..e8fecec4a6 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/SimrSchedulerBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/SimrSchedulerBackend.scala @@ -36,7 +36,7 @@ private[spark] class SimrSchedulerBackend( override def start() { super.start() - val driverUrl = "akka://spark@%s:%s/user/%s".format( + val driverUrl = "akka.tcp://spark@%s:%s/user/%s".format( System.getProperty("spark.driver.host"), System.getProperty("spark.driver.port"), CoarseGrainedSchedulerBackend.ACTOR_NAME) |