Merge pull request almond-sh#140 from alexarchambault/develop

alexarchambault · web-flow · commit 6153a2def8ba · 2017-03-30T15:10:37.000+02:00
Fix
diff --git a/spark/core/src/main/scala/jupyter/spark/session/JupyterSparkSession.scala b/spark/core/src/main/scala/jupyter/spark/session/JupyterSparkSession.scala
@@ -31,12 +31,8 @@ object JupyterSparkSession {
     }
 
     def yarn(conf: String = Spark.defaultYarnConf()): this.type = {
-
-      // setting this here, as the hook that set it too in sparkYarn is run too late for SparkSession
-      config("master", "yarn-client")
-
+      master("yarn-client")
       sparkYarn(conf)
-
       this
     }
 

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,8 @@ object JupyterSparkSession {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`def yarn(conf: String = Spark.defaultYarnConf()): this.type = {`
`34`		`-`
`35`		`- // setting this here, as the hook that set it too in sparkYarn is run too late for SparkSession`
`36`		`- config("master", "yarn-client")`
`37`		`-`
	`34`	`+ master("yarn-client")`
`38`	`35`	`sparkYarn(conf)`
`39`		`-`
`40`	`36`	`this`
`41`	`37`	`}`
`42`	`38`