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 ae...@apache.org on 2015/07/28 20:14:08 UTC
[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 <ae...@apache.org>
Authored: Tue Jul 28 11:12:08 2015 -0700
Committer: Anu Engineer <ae...@apache.org>
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(-)
----------------------------------------------------------------------