hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [5/5] git commit: Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
Date Sat, 06 Sep 2014 19:29:09 GMT
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 <arp@apache.org>
Authored: Sat Sep 6 12:28:22 2014 -0700
Committer: arp <arp@apache.org>
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
----------------------------------------------------------------------


Mime
View raw message