Index: hadoop-yarn-project/hadoop-yarn/bin/yarn-config.sh =================================================================== --- hadoop-yarn-project/hadoop-yarn/bin/yarn-config.sh (revision 1540590) +++ hadoop-yarn-project/hadoop-yarn/bin/yarn-config.sh (working copy) @@ -49,7 +49,7 @@ fi # Allow alternate conf dir location. -export YARN_CONF_DIR="${HADOOP_CONF_DIR:-$HADOOP_YARN_HOME/conf}" +export YARN_CONF_DIR="${YARN_CONF_DIR:-${HADOOP_CONF_DIR:-$HADOOP_YARN_HOME/conf}}" #check to see it is specified whether to use the slaves or the # masters file