hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [4/4] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Date Sat, 01 Aug 2015 06:19:08 GMT
Merge branch 'trunk' into HADOOP-12111


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/edaf2387
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/edaf2387
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/edaf2387

Branch: refs/heads/HADOOP-12111
Commit: edaf23879416577a3d489bb86e919dc054250428
Parents: a6692be 90b5104
Author: Allen Wittenauer <aw@apache.org>
Authored: Fri Jul 31 23:15:28 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Fri Jul 31 23:15:28 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 ++
 .../fs/contract/AbstractContractAppendTest.java |  4 +--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  5 +++
 .../BlockInfoUnderConstruction.java             |  5 ++-
 .../server/blockmanagement/BlockManager.java    | 38 ++++++++++----------
 .../blockmanagement/CorruptReplicasMap.java     |  4 +--
 .../blockmanagement/InvalidateBlocks.java       |  2 +-
 .../contract/hdfs/TestHDFSContractAppend.java   | 15 --------
 8 files changed, 34 insertions(+), 42 deletions(-)
----------------------------------------------------------------------



Mime
View raw message