Repository: spark Updated Branches: refs/heads/branch-2.0 4176da8be -> a01b95060
[SPARK-18114][HOTFIX] Fix line-too-long style error from backport of SPARK-18114 ## What changes were proposed in this pull request? Fix style error introduced in cherry-pick of https://github.com/apache/spark/pull/15643 to branch-2.0. ## How was this patch tested? Existing tests Author: Sean Owen <so...@cloudera.com> Closes #15719 from srowen/SPARK-18114.2. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a01b9506 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a01b9506 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a01b9506 Branch: refs/heads/branch-2.0 Commit: a01b950602c4bb56c5a7d6213cdf6b7515ff36ec Parents: 4176da8 Author: Sean Owen <so...@cloudera.com> Authored: Tue Nov 1 12:43:50 2016 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Tue Nov 1 12:43:50 2016 -0700 ---------------------------------------------------------------------- .../spark/scheduler/cluster/mesos/MesosClusterScheduler.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a01b9506/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala index cbf97c3..94827e4 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala @@ -448,7 +448,8 @@ private[spark] class MesosClusterScheduler( } desc.schedulerProperties .filter { case (key, _) => !replicatedOptionsBlacklist.contains(key) } - .foreach { case (key, value) => options ++= Seq("--conf", s""""$key=${shellEscape(value)}"""".stripMargin) } + .foreach { case (key, value) => + options ++= Seq("--conf", s""""$key=${shellEscape(value)}"""".stripMargin) } options } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
