spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshro...@apache.org
Subject spark git commit: [Minor] Build Failed: value defaultProperties not found
Date Sat, 20 Dec 2014 07:33:33 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 96d5b00ac -> 4346a2ba1


[Minor] Build Failed: value defaultProperties not found

Mvn Build Failed: value defaultProperties not found .Maybe related to this pr:
https://github.com/apache/spark/commit/1d648123a77bbcd9b7a34cc0d66c14fa85edfecd
andrewor14 can you look at this problem?

Author: huangzhaowei <carlmartinmax@gmail.com>

Closes #3749 from SaintBacchus/Mvn-Build-Fail and squashes the following commits:

8e2917c [huangzhaowei] Build Failed: value defaultProperties not found

(cherry picked from commit a764960b3b6d842eef7fa4777c8fa99d3f60fa1e)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4346a2ba
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4346a2ba
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4346a2ba

Branch: refs/heads/branch-1.2
Commit: 4346a2ba1a1c62732c5e313b464019fe6259a4a8
Parents: 96d5b00
Author: huangzhaowei <carlmartinmax@gmail.com>
Authored: Fri Dec 19 23:32:56 2014 -0800
Committer: Josh Rosen <joshrosen@databricks.com>
Committed: Fri Dec 19 23:33:19 2014 -0800

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/4346a2ba/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
index 958bd03..607b4df 100644
--- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
@@ -121,7 +121,7 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String,
St
     jars = Option(jars).orElse(sparkProperties.get("spark.jars")).orNull
     deployMode = Option(deployMode).orElse(env.get("DEPLOY_MODE")).orNull
     numExecutors = Option(numExecutors)
-      .getOrElse(defaultProperties.get("spark.executor.instances").orNull)
+      .getOrElse(sparkProperties.get("spark.executor.instances").orNull)
 
     // Try to set main class from JAR if no --class argument is given
     if (mainClass == null && !isPython && primaryResource != null) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message