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 8A462115BE for ; Wed, 17 Sep 2014 19:11:32 +0000 (UTC) Received: (qmail 94362 invoked by uid 500); 17 Sep 2014 19:11:23 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 94197 invoked by uid 500); 17 Sep 2014 19:11:23 -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 93847 invoked by uid 99); 17 Sep 2014 19:11:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 19:11:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A8710A19129; Wed, 17 Sep 2014 19:11:22 +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: Wed, 17 Sep 2014 19:11:32 -0000 Message-Id: In-Reply-To: <474a6688d4274baa93b68ef8f73b20a0@git.apache.org> References: <474a6688d4274baa93b68ef8f73b20a0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/11] git commit: Merge branch 'trunk' into HDFS-6581 Merge branch 'trunk' into HDFS-6581 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/24f81568 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/24f81568 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/24f81568 Branch: refs/heads/HDFS-6581 Commit: 24f81568868d4db1bcbe628d9ebd7bff7b7315de Parents: dcbc467 ea4e2e8 Author: arp Authored: Wed Sep 17 12:10:50 2014 -0700 Committer: arp Committed: Wed Sep 17 12:10:50 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 | 24 ++- .../server/namenode/XAttrPermissionFilter.java | 14 ++ .../src/site/apt/ExtendedAttributes.apt.vm | 3 +- .../hdfs/server/namenode/FSXAttrBaseTest.java | 148 +++++++++++++++++-- .../src/test/resources/testXAttrConf.xml | 73 +++++++++ hadoop-yarn-project/CHANGES.txt | 3 + 20 files changed, 405 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/24f81568/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/24f81568/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ----------------------------------------------------------------------