aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2016-02-04 12:47:32 -0800
committerAndrew Or <andrew@databricks.com>2016-02-04 12:47:32 -0800
commit7a4b37f02cffd6d971c07716688a7cb6cee26c8b (patch)
tree277771ec005f9dbd7857ce7b4ed860b10b7dcf7e /core
parent8e2f296306131e6c7c2f06d6672995d3ff8ab021 (diff)
downloadspark-7a4b37f02cffd6d971c07716688a7cb6cee26c8b.tar.gz
spark-7a4b37f02cffd6d971c07716688a7cb6cee26c8b.tar.bz2
spark-7a4b37f02cffd6d971c07716688a7cb6cee26c8b.zip
[HOTFIX] Fix style violation caused by c756bda
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
index 8ed7553258..b82196c86b 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
@@ -62,8 +62,9 @@ private[spark] class CoarseMesosSchedulerBackend(
// Maximum number of cores to acquire (TODO: we'll need more flexible controls here)
val maxCores = conf.get("spark.cores.max", Int.MaxValue.toString).toInt
- private[this] val shutdownTimeoutMS = conf.getTimeAsMs("spark.mesos.coarse.shutdownTimeout", "10s")
- .ensuring(_ >= 0, "spark.mesos.coarse.shutdownTimeout must be >= 0")
+ private[this] val shutdownTimeoutMS =
+ conf.getTimeAsMs("spark.mesos.coarse.shutdownTimeout", "10s")
+ .ensuring(_ >= 0, "spark.mesos.coarse.shutdownTimeout must be >= 0")
// Synchronization protected by stateLock
private[this] var stopCalled: Boolean = false