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 <j...@hortonworks.com> Authored: Wed Sep 17 13:12:45 2014 -0700 Committer: Jing Zhao <j...@hortonworks.com> 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 ----------------------------------------------------------------------
