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/01094cbf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/01094cbf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/01094cbf

Branch: refs/heads/HDFS-7240
Commit: 01094cbf0a44af89fd0a2e91812c9c0756de6934
Parents: 12bd963 4025326
Author: Anu Engineer <anu.engin...@gmail.com>
Authored: Wed Jul 22 10:28:28 2015 -0700
Committer: Anu Engineer <anu.engin...@gmail.com>
Committed: Wed Jul 22 10:28:28 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |   3 +
 .../hadoop-common/src/site/markdown/Metrics.md  |   6 +
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  14 +-
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   3 -
 .../BlockInfoUnderConstruction.java             |  19 +-
 .../server/blockmanagement/BlockManager.java    |  14 +-
 .../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      | 257 +++---------------
 .../namenode/metrics/FSNamesystemMBean.java     |   5 +
 .../src/main/resources/hdfs-default.xml         |   9 -
 .../apache/hadoop/hdfs/TestEncryptionZones.java |   6 +
 .../apache/hadoop/hdfs/TestLeaseRecovery.java   |  78 ------
 .../server/namenode/TestFSNamesystemMBean.java  |   5 +
 .../org/apache/hadoop/tools/HadoopArchives.java |  21 +-
 .../src/site/markdown/HadoopArchives.md.vm      |   2 +-
 .../apache/hadoop/tools/TestHadoopArchives.java |  26 +-
 hadoop-yarn-project/CHANGES.txt                 |   3 +
 .../hadoop/yarn/event/AsyncDispatcher.java      |   8 +
 .../hadoop/yarn/event/DrainDispatcher.java      |  11 +-
 .../hadoop/yarn/event/TestAsyncDispatcher.java  |  62 +++++
 26 files changed, 470 insertions(+), 383 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/01094cbf/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------

Reply via email to