Repository: spark Updated Branches: refs/heads/master f1e71d4c3 -> 2ffd3290f
[SPARK-3225]Typo in script use_conf_dir => user_conf_dir in load-spark-env.sh. Author: WangTao <barneystin...@aliyun.com> Closes #1926 from WangTaoTheTonic/TypoInScript and squashes the following commits: 0c104ad [WangTao] Typo in script Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2ffd3290 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2ffd3290 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2ffd3290 Branch: refs/heads/master Commit: 2ffd3290fe30c23df8da1efe153b84c23eb2e1cd Parents: f1e71d4 Author: WangTao <barneystin...@aliyun.com> Authored: Tue Aug 26 17:30:59 2014 -0700 Committer: Matei Zaharia <ma...@databricks.com> Committed: Tue Aug 26 17:30:59 2014 -0700 ---------------------------------------------------------------------- bin/load-spark-env.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2ffd3290/bin/load-spark-env.sh ---------------------------------------------------------------------- diff --git a/bin/load-spark-env.sh b/bin/load-spark-env.sh index d425f9f..493d378 100644 --- a/bin/load-spark-env.sh +++ b/bin/load-spark-env.sh @@ -27,12 +27,12 @@ if [ -z "$SPARK_ENV_LOADED" ]; then # Returns the parent of the directory this script lives in. parent_dir="$(cd `dirname $0`/..; pwd)" - use_conf_dir=${SPARK_CONF_DIR:-"$parent_dir/conf"} + user_conf_dir=${SPARK_CONF_DIR:-"$parent_dir/conf"} - if [ -f "${use_conf_dir}/spark-env.sh" ]; then + if [ -f "${user_conf_dir}/spark-env.sh" ]; then # Promote all variable declarations to environment (exported) variables set -a - . "${use_conf_dir}/spark-env.sh" + . "${user_conf_dir}/spark-env.sh" set +a fi fi --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
