Fix missed merge conflict

mccheah · mccheah · commit 3e7ce16043e8 · 2017-01-25T15:00:50.000-08:00
diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/Client.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/Client.scala
@@ -302,7 +302,7 @@ private[spark] class Client(
     }
     val topLevelMessage = s"The driver pod with name ${driverPod.getMetadata.getName}" +
       s" in namespace ${driverPod.getMetadata.getNamespace} was not ready in" +
-      s" $LAUNCH_TIMEOUT_SECONDS seconds."
+      s" $driverLaunchTimeoutSecs seconds."
     val podStatusPhase = if (driverPod.getStatus.getPhase != null) {
       s"Latest phase from the pod is: ${driverPod.getStatus.getPhase}"
     } else {

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ private[spark] class Client(`
`302`	`302`	`}`
`303`	`303`	`val topLevelMessage = s"The driver pod with name ${driverPod.getMetadata.getName}" +`
`304`	`304`	`s" in namespace ${driverPod.getMetadata.getNamespace} was not ready in" +`
`305`		`- s" $LAUNCH_TIMEOUT_SECONDS seconds."`
	`305`	`+ s" $driverLaunchTimeoutSecs seconds."`
`306`	`306`	`val podStatusPhase = if (driverPod.getStatus.getPhase != null) {`
`307`	`307`	`s"Latest phase from the pod is: ${driverPod.getStatus.getPhase}"`
`308`	`308`	`} else {`