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 aw...@apache.org on 2015/07/07 21:08:30 UTC
[8/9] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
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/b0589aa8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b0589aa8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b0589aa8
Branch: refs/heads/HADOOP-12111
Commit: b0589aa8f8a40f6084ca0643d96ae3e9ed93ba78
Parents: 6034366 e0febce
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Jul 7 08:42:00 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Tue Jul 7 08:42:00 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 12 +-
.../org/apache/hadoop/conf/Configuration.java | 8 +-
.../org/apache/hadoop/util/StringUtils.java | 8 ++
.../org/apache/hadoop/net/unix/DomainSocket.c | 9 +-
.../apache/hadoop/conf/TestConfiguration.java | 15 ++
.../org/apache/hadoop/util/TestStringUtils.java | 4 +
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 +-
.../hdfs/server/blockmanagement/BlockInfo.java | 7 +-
.../blockmanagement/BlockInfoContiguous.java | 9 +-
.../BlockInfoUnderConstruction.java | 22 ++-
.../BlockInfoUnderConstructionContiguous.java | 13 +-
.../server/blockmanagement/BlockManager.java | 143 +++++++++----------
.../hdfs/server/blockmanagement/BlocksMap.java | 4 +-
.../ContiguousBlockStorageOp.java | 7 +-
.../blockmanagement/CorruptReplicasMap.java | 62 ++++----
.../hdfs/server/namenode/FSDirWriteFileOp.java | 6 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 2 +-
.../hdfs/server/namenode/NamenodeFsck.java | 12 +-
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 6 +-
.../blockmanagement/BlockManagerTestUtil.java | 7 +-
.../server/blockmanagement/TestBlockInfo.java | 10 +-
.../blockmanagement/TestBlockManager.java | 10 +-
.../blockmanagement/TestCorruptReplicaInfo.java | 15 +-
hadoop-mapreduce-project/CHANGES.txt | 2 +-
hadoop-yarn-project/CHANGES.txt | 8 +-
...TimelineAuthenticationFilterInitializer.java | 5 +-
.../nodemanager/LinuxContainerExecutor.java | 12 +-
.../linux/privileged/PrivilegedOperation.java | 1 +
.../privileged/PrivilegedOperationExecutor.java | 2 +-
.../util/CgroupsLCEResourcesHandler.java | 6 +-
.../container-executor/impl/configuration.c | 8 +-
.../test/test-container-executor.c | 4 +-
.../TestLinuxContainerExecutorWithMocks.java | 13 +-
33 files changed, 257 insertions(+), 199 deletions(-)
----------------------------------------------------------------------