Merge branch 'trunk' into HADOOP-12756
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/005f4528 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/005f4528 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/005f4528 Branch: refs/heads/trunk Commit: 005f4528c7b0aa4a48cf62b11e837be886f267d3 Parents: 7d4431c 3552c2b Author: Kai Zheng <[email protected]> Authored: Tue Sep 20 08:09:29 2016 +0800 Committer: Kai Zheng <[email protected]> Committed: Tue Sep 20 08:09:29 2016 +0800 ---------------------------------------------------------------------- .../hadoop/crypto/key/KeyProviderFactory.java | 3 +- .../fs/CommonConfigurationKeysPublic.java | 8 + .../src/main/resources/core-default.xml | 8 + .../src/site/markdown/DeprecatedProperties.md | 1 + .../hadoop-kms/src/site/markdown/index.md.vm | 10 +- .../org/apache/hadoop/hdfs/DFSUtilClient.java | 13 +- .../apache/hadoop/hdfs/HdfsConfiguration.java | 3 + .../apache/hadoop/hdfs/KeyProviderCache.java | 6 +- .../hdfs/client/HdfsClientConfigKeys.java | 1 - .../org/apache/hadoop/test/TestHdfsHelper.java | 4 +- .../hdfs/nfs/nfs3/TestRpcProgramNfs3.java | 4 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 - .../src/main/resources/hdfs-default.xml | 8 - .../src/site/markdown/TransparentEncryption.md | 2 +- .../apache/hadoop/cli/TestCryptoAdminCLI.java | 4 +- .../apache/hadoop/hdfs/TestAclsEndToEnd.java | 3 +- .../org/apache/hadoop/hdfs/TestDFSUtil.java | 12 +- .../apache/hadoop/hdfs/TestEncryptionZones.java | 17 +- .../hadoop/hdfs/TestEncryptionZonesWithHA.java | 3 +- .../hadoop/hdfs/TestKeyProviderCache.java | 10 +- .../hadoop/hdfs/TestReservedRawPaths.java | 3 +- .../hdfs/TestSecureEncryptionZoneWithKMS.java | 6 +- .../namenode/TestNestedEncryptionZones.java | 4 +- .../namenode/metrics/TestNameNodeMetrics.java | 3 +- .../src/site/markdown/tools/hadoop-aws/index.md | 44 +---- .../containermanager/ContainerManagerImpl.java | 68 ++++++- .../containermanager/container/Container.java | 4 + .../container/ContainerEventType.java | 1 + .../container/ContainerImpl.java | 188 ++++++++++++++----- .../container/ContainerReInitEvent.java | 20 +- .../TestContainerManagerWithLCE.java | 42 ++++- .../containermanager/TestContainerManager.java | 152 +++++++++++++-- .../nodemanager/webapp/MockContainer.java | 10 + 33 files changed, 490 insertions(+), 177 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
