You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2014/10/01 18:06:00 UTC
[09/50] [abbrv] git commit: Merge branch 'trunk' into HDFS-6581
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/849ccfa6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/849ccfa6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/849ccfa6
Branch: refs/heads/trunk
Commit: 849ccfa699d77856eafb31f11e1af9ea764df12e
Parents: 4eab083 485c96e
Author: arp <ar...@apache.org>
Authored: Thu Sep 18 11:06:40 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Thu Sep 18 11:06:40 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 10 +-
.../apache/hadoop/crypto/CryptoInputStream.java | 11 +-
.../hadoop/crypto/CryptoStreamsTestBase.java | 18 +-
hadoop-common-project/hadoop-kms/pom.xml | 5 +
.../hadoop-kms/src/main/conf/kms-site.xml | 59 +++++-
.../key/kms/server/KMSAuthenticationFilter.java | 7 +-
.../crypto/key/kms/server/KMSConfiguration.java | 4 +
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 14 +-
.../hadoop-kms/src/site/apt/index.apt.vm | 163 ++++++++++++-----
.../hadoop/crypto/key/kms/server/MiniKMS.java | 2 +-
.../hadoop/crypto/key/kms/server/TestKMS.java | 7 +-
.../crypto/key/kms/server/TestKMSWithZK.java | 179 +++++++++++++++++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 12 ++
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 1 +
.../java/org/apache/hadoop/hdfs/DFSUtil.java | 41 +++--
.../server/namenode/EncryptionZoneManager.java | 17 +-
.../src/main/resources/hdfs-default.xml | 8 +
.../src/site/apt/TransparentEncryption.apt.vm | 6 +
.../apache/hadoop/cli/TestCryptoAdminCLI.java | 2 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 48 ++++-
.../hadoop/hdfs/TestEncryptionZonesWithHA.java | 3 +-
.../hadoop/hdfs/TestReservedRawPaths.java | 3 +-
hadoop-yarn-project/CHANGES.txt | 9 +
.../hadoop/yarn/conf/YarnConfiguration.java | 5 +
.../TestUnmanagedAMLauncher.java | 2 +-
.../yarn/client/api/impl/AMRMClientImpl.java | 1 +
.../TestApplicationMasterServiceOnHA.java | 2 +-
.../yarn/client/api/impl/TestAMRMClient.java | 2 +
.../hadoop/yarn/client/ClientRMProxy.java | 56 +++---
.../hadoop/yarn/security/AMRMTokenSelector.java | 9 +-
.../src/main/resources/yarn-default.xml | 10 ++
.../hadoop/yarn/client/TestClientRMProxy.java | 30 ++++
.../yarn/server/resourcemanager/RMContext.java | 4 +-
.../server/resourcemanager/RMContextImpl.java | 43 ++++-
.../server/resourcemanager/ResourceManager.java | 12 ++
.../metrics/SystemMetricsPublisher.java | 8 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 6 +-
.../scheduler/capacity/CapacityScheduler.java | 4 +
.../scheduler/fair/FairScheduler.java | 5 +
.../scheduler/fifo/FifoScheduler.java | 6 +
.../TestWorkPreservingRMRestart.java | 56 ++++++
.../metrics/TestSystemMetricsPublisher.java | 8 +-
.../attempt/TestRMAppAttemptTransitions.java | 5 +-
43 files changed, 759 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/849ccfa6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/849ccfa6/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
----------------------------------------------------------------------