Repository: spark Updated Branches: refs/heads/master f0811f928 -> 9d320e222
[SPARK-3696]Do not override the user-difined conf_dir https://issues.apache.org/jira/browse/SPARK-3696 We see if SPARK_CONF_DIR is already defined before assignment. Author: WangTaoTheTonic <[email protected]> Closes #2541 from WangTaoTheTonic/confdir and squashes the following commits: c3f31e0 [WangTaoTheTonic] Do not override the user-difined conf_dir Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9d320e22 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9d320e22 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9d320e22 Branch: refs/heads/master Commit: 9d320e222c221e5bb827cddf01a83e64a16d74ff Parents: f0811f9 Author: WangTaoTheTonic <[email protected]> Authored: Fri Oct 3 10:42:41 2014 -0700 Committer: Andrew Or <[email protected]> Committed: Fri Oct 3 10:42:41 2014 -0700 ---------------------------------------------------------------------- sbin/spark-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/9d320e22/sbin/spark-config.sh ---------------------------------------------------------------------- diff --git a/sbin/spark-config.sh b/sbin/spark-config.sh index 2718d6c..1d154e6 100755 --- a/sbin/spark-config.sh +++ b/sbin/spark-config.sh @@ -33,7 +33,7 @@ this="$config_bin/$script" export SPARK_PREFIX="`dirname "$this"`"/.. export SPARK_HOME="${SPARK_PREFIX}" -export SPARK_CONF_DIR="$SPARK_HOME/conf" +export SPARK_CONF_DIR="${SPARK_CONF_DIR:-"$SPARK_HOME/conf"}" # Add the PySpark classes to the PYTHONPATH: export PYTHONPATH="$SPARK_HOME/python:$PYTHONPATH" export PYTHONPATH="$SPARK_HOME/python/lib/py4j-0.8.2.1-src.zip:$PYTHONPATH" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
