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

Merge -c 1425560 from trunk to branch-2 to fix HDFS-4326. bump up Tomcat version for HttpFS to 6.0.36. Contributed by Alejandro Abdelnur. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425562 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2012-12-24 00:16:23 +00:00
parent 7194c52ec3
commit 6796f8d226
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
View File

@ -34,7 +34,7 @@
<description>Apache Hadoop HttpFS</description>
<properties>
<tomcat.version>6.0.32</tomcat.version>
<tomcat.version>6.0.36</tomcat.version>
<httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
<httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
<httpfs.source.revision>REVISION NOT AVAIL</httpfs.source.revision>
@ -531,7 +531,7 @@
<mkdir dir="downloads"/>
<get
src="${tomcat.download.url}"
dest="downloads/tomcat.tar.gz" verbose="true" skipexisting="true"/>
dest="downloads/apache-tomcat-${tomcat.version}.tar.gz" verbose="true" skipexisting="true"/>
<delete dir="${project.build.directory}/tomcat.exp"/>
<mkdir dir="${project.build.directory}/tomcat.exp"/>
@ -545,7 +545,7 @@
BUILD_DIR=`cygpath --unix '${project.build.directory}'`
fi
cd $BUILD_DIR/tomcat.exp
tar xzf ${basedir}/downloads/tomcat.tar.gz
tar xzf ${basedir}/downloads/apache-tomcat-${tomcat.version}.tar.gz
</echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true">
<arg line="./tomcat-untar.sh"/>

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

@ -151,6 +151,8 @@ Release 2.0.3-alpha - Unreleased
HDFS-4130. BKJM: The reading for editlog at NN starting using bkjm is not efficient.
(Han Xiao via umamahesh)
HDFS-4326. bump up Tomcat version for HttpFS to 6.0.36. (tucu via acmurthy)
OPTIMIZATIONS
BUG FIXES