diff options
| author | Matei Zaharia <matei@databricks.com> | 2013-12-29 18:15:46 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2013-12-29 18:15:46 -0500 |
| commit | 1ee7f5aee451eb5686f1c5ef251d1ebdddb0e847 (patch) | |
| tree | 725b2aaf8b2c88d2f7bb312d906b0a815475f5bb /core | |
| parent | 0bd1900cbce5946999c38293852d8ccd4f838930 (diff) | |
| download | spark-1ee7f5aee451eb5686f1c5ef251d1ebdddb0e847.tar.gz spark-1ee7f5aee451eb5686f1c5ef251d1ebdddb0e847.tar.bz2 spark-1ee7f5aee451eb5686f1c5ef251d1ebdddb0e847.zip | |
Fix a change that was lost during merge
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/local/LocalBackend.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/local/LocalBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/local/LocalBackend.scala index 4edc6a0d3f..897d47a9ad 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/local/LocalBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/local/LocalBackend.scala @@ -47,7 +47,8 @@ private[spark] class LocalActor( private val localExecutorId = "localhost" private val localExecutorHostname = "localhost" - val executor = new Executor(localExecutorId, localExecutorHostname, Seq.empty, isLocal = true) + val executor = new Executor( + localExecutorId, localExecutorHostname, scheduler.conf.getAll, isLocal = true) def receive = { case ReviveOffers => |