ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-3225]Typo in script

Browse source 
use_conf_dir => user_conf_dir in load-spark-env.sh.

Author: WangTao <barneystinson@aliyun.com>

Closes #1926 from WangTaoTheTonic/TypoInScript and squashes the following commits:

0c104ad [WangTao] Typo in script
This commit is contained in:
WangTao 2014-08-26 17:30:59 -07:00 committed by Matei Zaharia
parent f1e71d4c3b
commit 2ffd3290fe
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/load-spark-env.sh
View file

@ -27,12 +27,12 @@ if [ -z "$SPARK_ENV_LOADED" ]; then
# Returns the parent of the directory this script lives in. # Returns the parent of the directory this script lives in.
parent_dir="$(cd `dirname $0`/..; pwd)" 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 # Promote all variable declarations to environment (exported) variables
set -a set -a
. "${use_conf_dir}/spark-env.sh" . "${user_conf_dir}/spark-env.sh"
set +a set +a
fi fi
fi fi