hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [7/7] git commit: Merge branch 'trunk' into HDFS-6581
Date Mon, 08 Sep 2014 22:00:42 GMT
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/4ff128af
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ff128af
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ff128af

Branch: refs/heads/HDFS-6581
Commit: 4ff128af1223f44a5982fdd8717263ee0b930239
Parents: a18caf7 d989ac0
Author: arp <arp@apache.org>
Authored: Mon Sep 8 15:00:01 2014 -0700
Committer: arp <arp@apache.org>
Committed: Mon Sep 8 15:00:01 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |   3 +
 .../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 +-
 .../hadoop/crypto/key/TestValueQueue.java       |  14 ++
 ...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 +-
 27 files changed, 486 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ff128af/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ff128af/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
----------------------------------------------------------------------


Mime
View raw message