Author: acmurthy
Date: Mon Dec 24 00:16:23 2012
New Revision: 1425562
URL: http://svn.apache.org/viewvc?rev=1425562&view=rev
Log:
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.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml?rev=1425562&r1=1425561&r2=1425562&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
Mon Dec 24 00:16:23 2012
@@ -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"/>
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1425562&r1=1425561&r2=1425562&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Mon Dec 24 00:16:23 2012
@@ -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
