Merge remote-tracking branch 'origin/trunk' into HDFS-6584
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6997c1c6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6997c1c6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6997c1c6 Branch: refs/heads/HDFS-6581 Commit: 6997c1c65898958ad09e152bd993330ffd27de64 Parents: 867f0f1 d989ac0 Author: Jing Zhao <ji...@apache.org> Authored: Mon Sep 8 15:15:34 2014 -0700 Committer: Jing Zhao <ji...@apache.org> Committed: Mon Sep 8 15:15:34 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 6 + .../org/apache/hadoop/conf/Configuration.java | 4 +- .../crypto/key/KeyProviderCryptoExtension.java | 11 ++ .../crypto/key/kms/KMSClientProvider.java | 9 +- .../hadoop/crypto/key/kms/ValueQueue.java | 13 ++ .../org/apache/hadoop/conf/TestConfServlet.java | 2 +- .../apache/hadoop/conf/TestConfiguration.java | 6 +- .../crypto/key/TestKeyProviderFactory.java | 24 +-- .../hadoop/crypto/key/TestValueQueue.java | 14 ++ .../hadoop/security/TestLdapGroupsMapping.java | 4 +- .../alias/TestCredentialProviderFactory.java | 17 +- .../hadoop/security/ssl/KeyStoreTestUtil.java | 4 +- .../hadoop/security/ssl/TestSSLFactory.java | 4 +- ...rKeyGeneratorKeyProviderCryptoExtension.java | 22 +++ .../hadoop/crypto/key/kms/server/TestKMS.java | 17 ++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 11 ++ .../hadoop-hdfs/src/main/bin/hdfs | 2 +- .../java/org/apache/hadoop/hdfs/DFSClient.java | 1 + .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 6 + .../blockmanagement/DatanodeStorageInfo.java | 2 +- .../server/datanode/ShortCircuitRegistry.java | 22 ++- .../datanode/fsdataset/impl/FsDatasetCache.java | 109 +++++++++-- .../offlineImageViewer/OfflineImageViewer.java | 2 +- .../OfflineImageViewerPB.java | 2 +- .../src/main/resources/hdfs-default.xml | 21 +++ .../hadoop/hdfs/TestDistributedFileSystem.java | 37 ++++ .../server/datanode/TestFsDatasetCache.java | 2 +- .../datanode/TestFsDatasetCacheRevocation.java | 187 +++++++++++++++++++ hadoop-mapreduce-project/CHANGES.txt | 3 + .../src/site/apt/MapredAppMasterRest.apt.vm | 4 +- .../src/site/apt/HistoryServerRest.apt.vm | 4 +- .../src/main/html/js/thirdparty/jquery.js | 2 +- 32 files changed, 520 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6997c1c6/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6997c1c6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6997c1c6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6997c1c6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6997c1c6/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml ----------------------------------------------------------------------
