Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A8931192A for ; Fri, 29 Aug 2014 18:53:45 +0000 (UTC) Received: (qmail 18525 invoked by uid 500); 29 Aug 2014 18:53:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 18453 invoked by uid 500); 29 Aug 2014 18:53:44 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 18436 invoked by uid 99); 29 Aug 2014 18:53:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Aug 2014 18:53:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6DD369A877D; Fri, 29 Aug 2014 18:53:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tucu@apache.org To: common-commits@hadoop.apache.org Message-Id: <65049689d1e74e9a883668b1d6a2666e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) Date: Fri, 29 Aug 2014 18:53:44 +0000 (UTC) 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 Authored: Fri Aug 29 11:51:23 2014 -0700 Committer: Alejandro Abdelnur 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 @@ Apache Hadoop KMS - 6.0.36 ${project.build.directory}/${project.artifactId}-${project.version}/share/hadoop/kms/tomcat 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 @@ Apache Hadoop HttpFS - 6.0.36 REPO NOT AVAIL REPO NOT AVAIL REVISION NOT AVAIL 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 @@ ${env.HADOOP_PROTOC_PATH} 3.4.6 + + 6.0.41