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 2016/06/23 00:39:48 UTC
[5/5] hadoop git commit: Merge branch 'trunk' into HDFS-1312
Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7034dcf9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7034dcf9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7034dcf9
Branch: refs/heads/HDFS-1312
Commit: 7034dcf9b81ace4d39a1270bcbad8b583baaa6c1
Parents: edb4197 79a7289
Author: Anu Engineer <ae...@apache.org>
Authored: Wed Jun 22 17:36:52 2016 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Wed Jun 22 17:36:52 2016 -0700
----------------------------------------------------------------------
.../apache/hadoop/hdfs/server/mover/Mover.java | 15 +++-
.../namenode/ErasureCodingPolicyManager.java | 20 +++++
.../hadoop/hdfs/server/namenode/INodeFile.java | 19 ++++-
.../hadoop/hdfs/server/mover/TestMover.java | 32 +++++++
.../server/namenode/TestStripedINodeFile.java | 87 +++++++++++++++++++-
.../mapreduce/task/reduce/MergeManagerImpl.java | 2 +-
.../src/main/resources/mapred-default.xml | 3 +-
.../mapreduce/task/reduce/TestMergeManager.java | 18 ++++
8 files changed, 191 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org