Repository: spark
Updated Branches:
refs/heads/master 7768a800d -> 44d8b45a3
[SPARK-4110] Wrong comments about default settings in spark-daemon.sh
In spark-daemon.sh, thare are following comments.
# SPARK_CONF_DIR Alternate conf dir. Default is ${SPARK_PREFIX}/conf.
# SPARK_LOG_DIR Where log files are stored. PWD by default.
But, I think the default value for SPARK_CONF_DIR is `${SPARK_HOME}/conf` and
for SPARK_LOG_DIR is `${SPARK_HOME}/logs`.
Author: Kousuke Saruta <saru...@oss.nttdata.co.jp>
Closes #2972 from sarutak/SPARK-4110 and squashes the following commits:
5a171a2 [Kousuke Saruta] Fixed wrong comments
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/44d8b45a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/44d8b45a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/44d8b45a
Branch: refs/heads/master
Commit: 44d8b45a38c8d934628373a3b21084432516ee00
Parents: 7768a80
Author: Kousuke Saruta <saru...@oss.nttdata.co.jp>
Authored: Tue Oct 28 12:29:01 2014 -0700
Committer: Andrew Or <and...@databricks.com>
Committed: Tue Oct 28 12:29:01 2014 -0700
----------------------------------------------------------------------
sbin/spark-daemon.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/44d8b45a/sbin/spark-daemon.sh
----------------------------------------------------------------------
diff --git a/sbin/spark-daemon.sh b/sbin/spark-daemon.sh
index cba475e..89608bc 100755
--- a/sbin/spark-daemon.sh
+++ b/sbin/spark-daemon.sh
@@ -21,8 +21,8 @@
#
# Environment Variables
#
-# SPARK_CONF_DIR Alternate conf dir. Default is ${SPARK_PREFIX}/conf.
-# SPARK_LOG_DIR Where log files are stored. PWD by default.
+# SPARK_CONF_DIR Alternate conf dir. Default is ${SPARK_HOME}/conf.
+# SPARK_LOG_DIR Where log files are stored. ${SPARK_HOME}/logs by default.
# SPARK_MASTER host:path where spark code should be rsync'd from
# SPARK_PID_DIR The pid files are stored. /tmp by default.
# SPARK_IDENT_STRING A string representing this instance of spark. $USER
by default
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
