spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshro...@apache.org
Subject git commit: Move a bracket in validateSettings of SparkConf
Date Tue, 19 Aug 2014 21:05:07 GMT
Repository: spark
Updated Branches:
  refs/heads/master 94053a7b7 -> 76eaeb452


Move a bracket in validateSettings of SparkConf

Move a bracket in validateSettings of SparkConf

Author: hzw19900416 <carlmartinmax@gmail.com>

Closes #2012 from hzw19900416/codereading and squashes the following commits:

e717fb6 [hzw19900416] Move a bracket in validateSettings of SparkConf


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

Branch: refs/heads/master
Commit: 76eaeb4523ee01cabbea2d867daac48a277885a1
Parents: 94053a7
Author: hzw19900416 <carlmartinmax@gmail.com>
Authored: Tue Aug 19 14:04:49 2014 -0700
Committer: Josh Rosen <joshrosen@apache.org>
Committed: Tue Aug 19 14:04:49 2014 -0700

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/SparkConf.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/76eaeb45/core/src/main/scala/org/apache/spark/SparkConf.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
index 13f0bff..b4f321e 100644
--- a/core/src/main/scala/org/apache/spark/SparkConf.scala
+++ b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -227,7 +227,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging
{
     // Validate spark.executor.extraJavaOptions
     settings.get(executorOptsKey).map { javaOpts =>
       if (javaOpts.contains("-Dspark")) {
-        val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts)'.
" +
+        val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts').
" +
           "Set them directly on a SparkConf or in a properties file when using ./bin/spark-submit."
         throw new Exception(msg)
       }


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


Mime
View raw message