From 1a38b48026d5fe4f5b922ef68da453dfa01c1e72 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Wed, 13 Nov 2013 20:19:41 +0000 Subject: [PATCH] HDFS-5075 httpfs-config.sh calls out incorrect env script name git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541692 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh index 02e1a7172c7..621a2fa96f5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh @@ -55,7 +55,7 @@ print "Setting HTTPFS_HOME: ${HTTPFS_HOME}" # if [ -e "${HTTPFS_HOME}/bin/httpfs-env.sh" ]; then print "Sourcing: ${HTTPFS_HOME}/bin/httpfs-env.sh" - source ${HTTPFS_HOME}/bin/HTTPFS-env.sh + source ${HTTPFS_HOME}/bin/httpfs-env.sh grep "^ *export " ${HTTPFS_HOME}/bin/httpfs-env.sh | sed 's/ *export/ setting/' fi diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 6ef8fd22113..302bf22fc6b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -544,6 +544,9 @@ Release 2.3.0 - UNRELEASED HDFS-5474. Deletesnapshot can make Namenode in safemode on NN restarts. (Sathish via jing9) + HDFS-5075. httpfs-config.sh calls out incorrect env script name + (Timothy St. Clair via stevel) + Release 2.2.1 - UNRELEASED INCOMPATIBLE CHANGES