diff options
| author | Andrew Or <andrewor14@gmail.com> | 2014-05-12 19:42:35 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-12 19:42:35 -0700 |
| commit | ba96bb3d591130075763706526f86fb2aaffa3ae (patch) | |
| tree | 447c09ad013520c130e0fbb92fd5fb171f91e96b /core | |
| parent | 156df87e7ca0e6cda2cc970ecd1466ce06f7576f (diff) | |
| download | spark-ba96bb3d591130075763706526f86fb2aaffa3ae.tar.gz spark-ba96bb3d591130075763706526f86fb2aaffa3ae.tar.bz2 spark-ba96bb3d591130075763706526f86fb2aaffa3ae.zip | |
[SPARK-1780] Non-existent SPARK_DAEMON_OPTS is lurking around
What they really mean is SPARK_DAEMON_***JAVA***_OPTS
Author: Andrew Or <andrewor14@gmail.com>
Closes #751 from andrewor14/spark-daemon-opts and squashes the following commits:
70c41f9 [Andrew Or] SPARK_DAEMON_OPTS -> SPARK_DAEMON_JAVA_OPTS
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkConf.scala | 2 |
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 bd21fdc5a1..800616622d 100644 --- a/core/src/main/scala/org/apache/spark/SparkConf.scala +++ b/core/src/main/scala/org/apache/spark/SparkConf.scala @@ -247,7 +247,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging { | - ./spark-submit with conf/spark-defaults.conf to set defaults for an application | - ./spark-submit with --driver-java-options to set -X options for a driver | - spark.executor.extraJavaOptions to set -X options for executors - | - SPARK_DAEMON_OPTS to set java options for standalone daemons (i.e. master, worker) + | - SPARK_DAEMON_JAVA_OPTS to set java options for standalone daemons (master or worker) """.stripMargin logError(error) |