aboutsummaryrefslogtreecommitdiff
path: root/conf/spark-env.sh.template
diff options
context:
space:
mode:
authorAndrew Or <andrewor14@gmail.com>2014-05-12 19:42:35 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-05-12 19:42:35 -0700
commitba96bb3d591130075763706526f86fb2aaffa3ae (patch)
tree447c09ad013520c130e0fbb92fd5fb171f91e96b /conf/spark-env.sh.template
parent156df87e7ca0e6cda2cc970ecd1466ce06f7576f (diff)
downloadspark-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 'conf/spark-env.sh.template')
-rwxr-xr-xconf/spark-env.sh.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template
index f906be611a..4479e1e34c 100755
--- a/conf/spark-env.sh.template
+++ b/conf/spark-env.sh.template
@@ -39,5 +39,5 @@
# - SPARK_WORKER_DIR, to set the working directory of worker processes
# - SPARK_WORKER_OPTS, to set config properties only for the worker (e.g. "-Dx=y")
# - SPARK_HISTORY_OPTS, to set config properties only for the history server (e.g. "-Dx=y")
-# - SPARK_DAEMON_OPTS, to set config properties for all daemons (e.g. "-Dx=y")
+# - SPARK_DAEMON_JAVA_OPTS, to set config properties for all daemons (e.g. "-Dx=y")
# - SPARK_PUBLIC_DNS, to set the public dns name of the master or workers