Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-3160. svn merge -c 1306665 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306666 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-03-29 01:16:26 +00:00
parent 979839eb2b
commit ed41b8dfe3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh
View File

@ -55,8 +55,8 @@ if [ "${1}" = "stop" ]; then
fi fi
if [ "${HTTPFS_SILENT}" != "true" ]; then if [ "${HTTPFS_SILENT}" != "true" ]; then
${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@" exec ${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@"
else else
${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@" > /dev/null exec ${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@" > /dev/null
fi fi

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -672,6 +672,9 @@ Release 0.23.2 - UNRELEASED
HDFS-3101. Cannot read empty file using WebHDFS. (szetszwo) HDFS-3101. Cannot read empty file using WebHDFS. (szetszwo)
HDFS-3160. httpfs should exec catalina instead of forking it.
(Roman Shaposhnik via eli)
Release 0.23.1 - 2012-02-17 Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES