Repository: hadoop Updated Branches: refs/heads/trunk c686aa353 -> b1dce2aa2
HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b1dce2aa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b1dce2aa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b1dce2aa Branch: refs/heads/trunk Commit: b1dce2aa21d9692accdec710ef044d2a2e04ba33 Parents: c686aa3 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:22 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/b1dce2aa/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 6376364..1930e5d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -473,6 +473,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/b1dce2aa/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 b65e67a..b1ca307 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/b1dce2aa/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 8701bb0..24fa87b 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/b1dce2aa/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index e9adc31..5aa54a7 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>