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/23 17:20:26 UTC
[14/14] 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/1e4f3614
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1e4f3614
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1e4f3614
Branch: refs/heads/HADOOP-12111
Commit: 1e4f361471cb0895e0c3ab22adf31af456315c60
Parents: b8750c6 ee98d63
Author: Allen Wittenauer <aw...@apache.org>
Authored: Thu Jul 23 08:20:05 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Thu Jul 23 08:20:05 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 9 +
.../org/apache/hadoop/io/nativeio/NativeIO.java | 4 -
.../hadoop-common/src/site/markdown/Metrics.md | 6 +
.../hadoop/hdfs/web/ByteRangeInputStream.java | 57 +++-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 13 +
.../blockmanagement/InvalidateBlocks.java | 5 +-
.../server/namenode/EncryptionZoneManager.java | 7 +
.../hdfs/server/namenode/FSDirAppendOp.java | 261 +++++++++++++++++++
.../server/namenode/FSDirStatAndListingOp.java | 2 +-
.../hdfs/server/namenode/FSDirTruncateOp.java | 16 +-
.../hdfs/server/namenode/FSDirWriteFileOp.java | 6 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 4 +-
.../hdfs/server/namenode/FSNamesystem.java | 247 +++---------------
.../namenode/metrics/FSNamesystemMBean.java | 5 +
.../apache/hadoop/hdfs/TestEncryptionZones.java | 6 +
.../server/namenode/TestFSNamesystemMBean.java | 5 +
.../hdfs/web/TestByteRangeInputStream.java | 35 +--
.../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 41 +++
.../org/apache/hadoop/tools/HadoopArchives.java | 21 +-
.../src/site/markdown/HadoopArchives.md.vm | 2 +-
.../apache/hadoop/tools/TestHadoopArchives.java | 26 +-
.../hadoop/fs/azure/NativeAzureFileSystem.java | 8 +-
hadoop-yarn-project/CHANGES.txt | 14 +
.../hadoop/yarn/conf/YarnConfiguration.java | 11 +
.../hadoop/yarn/event/AsyncDispatcher.java | 8 +
.../src/main/resources/yarn-default.xml | 26 ++
.../hadoop/yarn/event/DrainDispatcher.java | 11 +-
.../hadoop/yarn/event/TestAsyncDispatcher.java | 62 +++++
.../util/TestNodeManagerHardwareUtils.java | 5 +
.../resourcemanager/recovery/RMStateStore.java | 9 +-
.../scheduler/SchedulerApplicationAttempt.java | 2 +-
.../scheduler/capacity/LeafQueue.java | 8 +-
.../TestCapacitySchedulerNodeLabelUpdate.java | 64 +++++
33 files changed, 722 insertions(+), 284 deletions(-)
----------------------------------------------------------------------