Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0AE34184BF for ; Tue, 28 Jul 2015 18:14:13 +0000 (UTC) Received: (qmail 744 invoked by uid 500); 28 Jul 2015 18:14:04 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 616 invoked by uid 500); 28 Jul 2015 18:14:04 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 108 invoked by uid 99); 28 Jul 2015 18:14:04 -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; Tue, 28 Jul 2015 18:14:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B0CAE35E6; Tue, 28 Jul 2015 18:14:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Tue, 28 Jul 2015 18:14:08 -0000 Message-Id: <9f6eb29e22e74aeaa74a9320d18b6488@git.apache.org> In-Reply-To: <18dc43a1b3b34583ac087a61a857225f@git.apache.org> References: <18dc43a1b3b34583ac087a61a857225f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] hadoop git commit: Merge branch 'trunk' into HDFS-7240 Merge branch 'trunk' into HDFS-7240 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/188d283a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/188d283a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/188d283a Branch: refs/heads/HDFS-7240 Commit: 188d283a4debe2151ee3327ac23bad86b9b6aba3 Parents: 2ebe8c7 f170934 Author: Anu Engineer Authored: Tue Jul 28 11:12:08 2015 -0700 Committer: Anu Engineer Committed: Tue Jul 28 11:12:08 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 + .../apache/hadoop/io/retry/MultiException.java | 49 +++ .../hadoop/io/retry/RetryInvocationHandler.java | 99 +++++- .../src/site/markdown/FileSystemShell.md | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + .../ha/ConfiguredFailoverProxyProvider.java | 52 ++- .../ha/RequestHedgingProxyProvider.java | 186 ++++++++++ .../markdown/HDFSHighAvailabilityWithNFS.md | 9 +- .../markdown/HDFSHighAvailabilityWithQJM.md | 10 +- .../ha/TestRequestHedgingProxyProvider.java | 350 +++++++++++++++++++ hadoop-yarn-project/CHANGES.txt | 6 + .../container-executor/impl/configuration.c | 4 +- .../test/test-container-executor.c | 22 +- .../webapp/CapacitySchedulerPage.java | 5 +- 14 files changed, 755 insertions(+), 44 deletions(-) ----------------------------------------------------------------------