Repository: spark Updated Branches: refs/heads/branch-1.1 5d991db8a -> d5af9e160
[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 <barneystin...@aliyun.com> Closes #2541 from WangTaoTheTonic/confdir and squashes the following commits: c3f31e0 [WangTaoTheTonic] Do not override the user-difined conf_dir (cherry picked from commit 9d320e222c221e5bb827cddf01a83e64a16d74ff) Signed-off-by: Andrew Or <andrewo...@gmail.com> Conflicts: sbin/spark-config.sh Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d5af9e16 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d5af9e16 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d5af9e16 Branch: refs/heads/branch-1.1 Commit: d5af9e160e6e1927aa79605df3704ddd7a3f82ad Parents: 5d991db Author: WangTaoTheTonic <barneystin...@aliyun.com> Authored: Fri Oct 3 10:42:41 2014 -0700 Committer: Andrew Or <andrewo...@gmail.com> Committed: Fri Oct 3 10:47:47 2014 -0700 ---------------------------------------------------------------------- sbin/spark-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d5af9e16/sbin/spark-config.sh ---------------------------------------------------------------------- diff --git a/sbin/spark-config.sh b/sbin/spark-config.sh index 5c87da5..396c729 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: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
