Repository: spark Updated Branches: refs/heads/branch-1.0 b530bc92a -> 17e9f53e1
[HOTFIX] use --driver-java-options instead of --conf for branch-1.0 This fixes a build-break caused by b78422ae170b89fa09e8910e247cbfecc23442f8, a previous hotfix. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/17e9f53e Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/17e9f53e Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/17e9f53e Branch: refs/heads/branch-1.0 Commit: 17e9f53e1c91655fa1385c54297aaa2f091260da Parents: b530bc9 Author: Josh Rosen <[email protected]> Authored: Mon Jan 12 16:04:45 2015 -0800 Committer: Josh Rosen <[email protected]> Committed: Mon Jan 12 16:04:45 2015 -0800 ---------------------------------------------------------------------- .../test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/17e9f53e/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala index 27e1ad9..da79980 100644 --- a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala +++ b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala @@ -260,7 +260,7 @@ class SparkSubmitSuite extends FunSuite with ShouldMatchers with ResetSystemProp "--class", SimpleApplicationTest.getClass.getName.stripSuffix("$"), "--name", "testApp", "--master", "local", - "--conf", "spark.ui.enabled=false", + "--driver-java-options", "-Dspark.ui.enabled=false", unusedJar.toString) runSparkSubmit(args) } @@ -275,7 +275,7 @@ class SparkSubmitSuite extends FunSuite with ShouldMatchers with ResetSystemProp "--name", "testApp", "--master", "local-cluster[2,1,512]", "--jars", jarsString, - "--conf", "spark.ui.enabled=false", + "--driver-java-options", "-Dspark.ui.enabled=false", unusedJar.toString) runSparkSubmit(args) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
