diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index d77d024491..f3a02377d9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -343,6 +343,8 @@ Trunk (Unreleased) HADOOP-11284. Fix variable name mismatches in hadoop-functions.sh (Masatake Iwasaki via aw) + HADOOP-11298. slaves.sh and stop-all.sh are missing slashes (aw) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) diff --git a/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh b/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh index 0ffb4849cf..a8f066063d 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh @@ -36,7 +36,7 @@ if [[ -n "${HADOOP_PREFIX}" ]]; then DEFAULT_LIBEXEC_DIR="${HADOOP_PREFIX}/libexec" else this="${BASH_SOURCE-$0}" - bin=$(cd -P -- "$(dirname -- "${this}")" >dev/null && pwd -P) + bin=$(cd -P -- "$(dirname -- "${this}")" >/dev/null && pwd -P) DEFAULT_LIBEXEC_DIR="${bin}/../libexec" fi diff --git a/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh b/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh index a0311e482e..55424d84ba 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh @@ -26,7 +26,7 @@ if [[ -n "${HADOOP_PREFIX}" ]]; then DEFAULT_LIBEXEC_DIR="${HADOOP_PREFIX}/libexec" else this="${BASH_SOURCE-$0}" - bin=$(cd -P -- "$(dirname -- "${this}")" >dev/null && pwd -P) + bin=$(cd -P -- "$(dirname -- "${this}")" >/dev/null && pwd -P) DEFAULT_LIBEXEC_DIR="${bin}/../libexec" fi