aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorReynold Xin <rxin@databricks.com>2016-04-30 01:32:00 -0700
committerYin Huai <yhuai@databricks.com>2016-04-30 01:32:00 -0700
commit8dc3987d095ae01ad80c89b8f052f231e0807990 (patch)
tree0ce2b3cd50fa778cf28cc51eb27e19b3caeeed55 /core
parentb3ea579314945dc1fcb4a260fbc7af8479d139f2 (diff)
downloadspark-8dc3987d095ae01ad80c89b8f052f231e0807990.tar.gz
spark-8dc3987d095ae01ad80c89b8f052f231e0807990.tar.bz2
spark-8dc3987d095ae01ad80c89b8f052f231e0807990.zip
[SPARK-15028][SQL] Remove HiveSessionState.setDefaultOverrideConfs
## What changes were proposed in this pull request? This patch removes some code that are no longer relevant -- mainly HiveSessionState.setDefaultOverrideConfs. ## How was this patch tested? N/A Author: Reynold Xin <rxin@databricks.com> Closes #12806 from rxin/SPARK-15028.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/SparkConf.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
index e671a3e95a..33ed0d5493 100644
--- a/core/src/main/scala/org/apache/spark/SparkConf.scala
+++ b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -455,7 +455,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
}
// Validate spark.executor.extraJavaOptions
- getOption(executorOptsKey).map { javaOpts =>
+ getOption(executorOptsKey).foreach { javaOpts =>
if (javaOpts.contains("-Dspark")) {
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."