Reverting HDFS-4326 since it caused 'mvn package' to break.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425400 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml

@@ -34,7 +34,7 @@
   <description>Apache Hadoop HttpFS</description>
 
   <properties>
-    <tomcat.version>6.0.36</tomcat.version>
+    <tomcat.version>6.0.32</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>

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -151,8 +151,6 @@ 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)
-
   OPTIMIZATIONS
 
   BUG FIXES