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 9E99311133 for ; Sat, 6 Sep 2014 19:29:07 +0000 (UTC) Received: (qmail 69552 invoked by uid 500); 6 Sep 2014 19:29:06 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 69366 invoked by uid 500); 6 Sep 2014 19:29:06 -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 69264 invoked by uid 99); 6 Sep 2014 19:29: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; Sat, 06 Sep 2014 19:29:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B046DA0C97B; Sat, 6 Sep 2014 19:29: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: Sat, 06 Sep 2014 19:29:09 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 Merge remote-tracking branch 'apache-commit/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/31bbeaf3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/31bbeaf3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/31bbeaf3 Branch: refs/heads/HDFS-6581 Commit: 31bbeaf383a728a0453f5dbe93eed0ab18b5b992 Parents: 339d21f 88209ce Author: arp Authored: Sat Sep 6 12:28:22 2014 -0700 Committer: arp Committed: Sat Sep 6 12:28:22 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 5 + .../crypto/key/kms/KMSClientProvider.java | 6 +- hadoop-common-project/hadoop-kms/pom.xml | 4 +- .../hadoop/crypto/key/kms/server/MiniKMS.java | 197 +++++++++++++++++++ .../hadoop/crypto/key/kms/server/TestKMS.java | 88 ++------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 + .../java/org/apache/hadoop/hdfs/DFSClient.java | 4 + .../hadoop/hdfs/DistributedFileSystem.java | 24 +++ .../server/blockmanagement/BlockManager.java | 23 ++- .../server/blockmanagement/DatanodeManager.java | 6 +- .../server/blockmanagement/HostFileManager.java | 4 + .../hdfs/server/namenode/FSNamesystem.java | 46 +++-- .../apache/hadoop/hdfs/TestEncryptionZones.java | 43 ++++ .../hdfs/server/namenode/NameNodeAdapter.java | 2 +- 14 files changed, 351 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/31bbeaf3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ----------------------------------------------------------------------