Repository: hadoop Updated Branches: refs/heads/HADOOP-12930 d0ff3c336 -> e4958f874
HADOOP-13089. hadoop distcp adds client opts twice when dynamic Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e4958f87 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e4958f87 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e4958f87 Branch: refs/heads/HADOOP-12930 Commit: e4958f8749e6cac700b6a5770b3f684b6e21ca8e Parents: d0ff3c3 Author: Allen Wittenauer <a...@apache.org> Authored: Wed May 4 10:50:15 2016 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Wed May 4 10:50:15 2016 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/src/main/bin/hadoop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4958f87/hadoop-common-project/hadoop-common/src/main/bin/hadoop ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop index 7b18d22..3e514ff 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop @@ -161,6 +161,10 @@ function hadoopcmd_case fi ;; esac + + # Always respect HADOOP_OPTS and HADOOP_CLIENT_OPTS + hadoop_debug "Appending HADOOP_CLIENT_OPTS onto HADOOP_OPTS" + HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}" } # This script runs the hadoop core commands. @@ -203,10 +207,6 @@ if [[ ${HADOOP_SLAVE_MODE} = true ]]; then exit $? fi -# Always respect HADOOP_OPTS and HADOOP_CLIENT_OPTS -hadoop_debug "Appending HADOOP_CLIENT_OPTS onto HADOOP_OPTS" -HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}" - if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then HADOOP_SECURE_USER="${HADOOP_SUBCMD_SECUREUSER}" hadoop_verify_secure_prereq --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
