Repository: spark Updated Branches: refs/heads/master 8e2f29630 -> 7a4b37f02
[HOTFIX] Fix style violation caused by c756bda Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7a4b37f0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7a4b37f0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7a4b37f0 Branch: refs/heads/master Commit: 7a4b37f02cffd6d971c07716688a7cb6cee26c8b Parents: 8e2f296 Author: Andrew Or <and...@databricks.com> Authored: Thu Feb 4 12:47:32 2016 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Thu Feb 4 12:47:32 2016 -0800 ---------------------------------------------------------------------- .../scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7a4b37f0/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala ---------------------------------------------------------------------- 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 8ed7553..b82196c 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org