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 568EA11C36 for ; Fri, 19 Sep 2014 05:28:20 +0000 (UTC) Received: (qmail 58691 invoked by uid 500); 19 Sep 2014 05:28:05 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 58605 invoked by uid 500); 19 Sep 2014 05:28:05 -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 57976 invoked by uid 99); 19 Sep 2014 05:28:05 -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, 19 Sep 2014 05:28:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 63FC8A1CF17; Fri, 19 Sep 2014 05:28:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Fri, 19 Sep 2014 05:28:41 -0000 Message-Id: <24562d9a059b4fd6a7af183079b6c028@git.apache.org> In-Reply-To: <76fd3d410c074e06b5a94666d22db947@git.apache.org> References: <76fd3d410c074e06b5a94666d22db947@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [39/50] git commit: Merge changes from trunk Merge changes from trunk Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/911979c8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/911979c8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/911979c8 Branch: refs/heads/HDFS-6581 Commit: 911979c8ab2e6dd4fe82023ae022a1582c8590c2 Parents: b014e83 ea4e2e8 Author: Jing Zhao Authored: Wed Sep 17 13:12:45 2014 -0700 Committer: Jing Zhao Committed: Wed Sep 17 13:12:45 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 11 ++ hadoop-common-project/hadoop-common/pom.xml | 3 + .../crypto/key/KeyProviderCryptoExtension.java | 8 +- .../apache/hadoop/crypto/TestCryptoCodec.java | 18 ++- .../key/TestKeyProviderCryptoExtension.java | 2 +- .../key/kms/server/KMSExceptionsProvider.java | 2 +- .../kms/server/KeyAuthorizationKeyProvider.java | 12 ++ .../hadoop-kms/src/site/apt/index.apt.vm | 8 +- .../server/TestKeyAuthorizationKeyProvider.java | 53 +++++++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + hadoop-hdfs-project/hadoop-hdfs/pom.xml | 7 + .../java/org/apache/hadoop/hdfs/DFSClient.java | 3 +- .../hdfs/server/common/HdfsServerConstants.java | 3 +- .../hdfs/server/namenode/FSDirectory.java | 42 +++++- .../hdfs/server/namenode/FSNamesystem.java | 25 +++- .../server/namenode/XAttrPermissionFilter.java | 14 ++ .../src/site/apt/ExtendedAttributes.apt.vm | 3 +- .../hdfs/server/namenode/FSXAttrBaseTest.java | 148 +++++++++++++++++-- .../src/test/resources/testXAttrConf.xml | 73 +++++++++ 19 files changed, 403 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/911979c8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/911979c8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/911979c8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/911979c8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ----------------------------------------------------------------------