Repository: hadoop Updated Branches: refs/heads/branch-2 73a0e4665 -> 09a0ad328
HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) (cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/09a0ad32 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09a0ad32 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09a0ad32 Branch: refs/heads/branch-2 Commit: 09a0ad328f9adbb7b3c519ea4fbef27a0d97992f Parents: 73a0e46 Author: Alejandro Abdelnur <t...@apache.org> Authored: Fri Aug 29 11:51:23 2014 -0700 Committer: Alejandro Abdelnur <t...@apache.org> Committed: Fri Aug 29 11:53:13 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-kms/pom.xml | 1 - hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 1 - hadoop-project/pom.xml | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/09a0ad32/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 5c52255..eba1dff 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -143,6 +143,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. (Lei Xu via wang) + HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest + 6.x version. (rkanter via tucu) + OPTIMIZATIONS HADOOP-10838. Byte array native checksumming. (James Thomas via todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/09a0ad32/hadoop-common-project/hadoop-kms/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml index edfd760..7d516ec 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -34,7 +34,6 @@ <description>Apache Hadoop KMS</description> <properties> - <tomcat.version>6.0.36</tomcat.version> <kms.tomcat.dist.dir> ${project.build.directory}/${project.artifactId}-${project.version}/share/hadoop/kms/tomcat </kms.tomcat.dist.dir> http://git-wip-us.apache.org/repos/asf/hadoop/blob/09a0ad32/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 2bf85bf..4d20fa0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -34,7 +34,6 @@ <description>Apache Hadoop HttpFS</description> <properties> - <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> http://git-wip-us.apache.org/repos/asf/hadoop/blob/09a0ad32/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 2d60165..08959e3 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -67,6 +67,8 @@ <protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path> <zookeeper.version>3.4.6</zookeeper.version> + + <tomcat.version>6.0.41</tomcat.version> </properties> <dependencyManagement>
