Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8FEB5200B98 for ; Mon, 19 Sep 2016 02:13:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8E7F2160AE0; Mon, 19 Sep 2016 00:13:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D2932160AD8 for ; Mon, 19 Sep 2016 02:13:07 +0200 (CEST) Received: (qmail 38644 invoked by uid 500); 19 Sep 2016 00:13:06 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 38624 invoked by uid 99); 19 Sep 2016 00:13:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2016 00:13:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B484E03C0; Mon, 19 Sep 2016 00:13:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drankye@apache.org To: common-commits@hadoop.apache.org Date: Mon, 19 Sep 2016 00:13:09 -0000 Message-Id: <61d5800a0b62443aa11eba218747de91@git.apache.org> In-Reply-To: <8dc764ea10044fad9aec081ce2ff32fa@git.apache.org> References: <8dc764ea10044fad9aec081ce2ff32fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] hadoop git commit: Merge branch 'trunk' into HADOOP-12756 archived-at: Mon, 19 Sep 2016 00:13:08 -0000 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/HADOOP-12756 Commit: 005f4528c7b0aa4a48cf62b11e837be886f267d3 Parents: 7d4431c 3552c2b Author: Kai Zheng Authored: Tue Sep 20 08:09:29 2016 +0800 Committer: Kai Zheng 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: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org