[incubator-amaterasu] 06/36: Merge branch 'nadav-har-tzvi-AMATERASU-45-Rebase' of github.com:nadav-har-tzvi/incubator-amaterasu into nadav-har-tzvi-AMATERASU-45-Rebase

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yaniv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu.git

commit fbbf22291caa703ff32e4986869969735e5d8d65
Merge: f9398c9 72668dc
Author: Yaniv Rodenski <ya...@shinto.io>
AuthorDate: Sun Apr 21 12:39:46 2019 +1000

    Merge branch 'nadav-har-tzvi-AMATERASU-45-Rebase' of github.com:nadav-har-tzvi/incubator-amaterasu into nadav-har-tzvi-AMATERASU-45-Rebase

 .../spark/dispatcher/runners/providers/PySparkRunnerProvider.scala      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc frameworks/spark/dispatcher/src/main/scala/org/apache/amaterasu/frameworks/spark/dispatcher/runners/providers/PySparkRunnerProvider.scala
index 0472c92,0b7ed21..2c718d9
--- a/frameworks/spark/dispatcher/src/main/scala/org/apache/amaterasu/frameworks/spark/dispatcher/runners/providers/PySparkRunnerProvider.scala
+++ b/frameworks/spark/dispatcher/src/main/scala/org/apache/amaterasu/frameworks/spark/dispatcher/runners/providers/PySparkRunnerProvider.scala
@@@ -10,9 -10,9 +10,9 @@@ class PySparkRunnerProvider(val env: St
      val command = super.getCommand(jobId: String, actionData: ActionData, env: String, executorId: String, callbackAddress: String)
      log.info(s"===> Cluster manager: ${conf.mode}")
      command +
 -      //s" $$SPARK_HOME/conf/spark-env.sh &&" +
 +      //s" $$SPARK_HOME/conf/spark-env.sh" +
        s" && env PYSPARK_PYTHON=$getVirtualPythonPath" +
-       s" $$SPARK_HOME/bin/spark-submit ${actionData.getSrc}"
+       s" && $$SPARK_HOME/bin/spark-submit ${actionData.getSrc}"
    }
  
    override def getRunnerResources: Array[String] = {