Revert "[SPARK-12345][MESOS] Properly filter out SPARK_HOME in the Mesos REST server"
This reverts commit 8184568810e8a2e7d5371db2c6a0366ef4841f70. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8a9417bc Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8a9417bc Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8a9417bc Branch: refs/heads/master Commit: 8a9417bc4b227c57bdb0a5a38a225dbdf6e69f64 Parents: 14be5de Author: Andrew Or <and...@databricks.com> Authored: Fri Dec 18 16:22:41 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Fri Dec 18 16:22:41 2015 -0800 ---------------------------------------------------------------------- .../scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8a9417bc/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala b/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala index c0b9359..24510db 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala @@ -99,7 +99,7 @@ private[mesos] class MesosSubmitRequestServlet( // cause spark-submit script to look for files in SPARK_HOME instead. // We only need the ability to specify where to find spark-submit script // which user can user spark.executor.home or spark.home configurations. - val environmentVariables = request.environmentVariables.filterKeys(!_.equals("SPARK_HOME")) + val environmentVariables = request.environmentVariables.filter(!_.equals("SPARK_HOME")) val name = request.sparkProperties.get("spark.app.name").getOrElse(mainClass) // Construct driver description --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
