Edit conflicts

Conflicts: yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
apache · Apr 8, 2015 · 47c0014 · 47c0014
2 parents 52b29fe + aaacb42
commit 47c0014
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -588,8 +588,7 @@ private[spark] class Client(
         val formattedDetails = details
           .map { case (k, v) =>
           val newValue = Option(v).filter(_.nonEmpty).getOrElse("N/A")
-          s"\n\t $k: $newValue"
-        }
+          s"\n\t $k: $newValue" }
           .mkString("")
 
         // If DEBUG is enabled, log report details every iteration