Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a53c369 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a53c369 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a53c369 Branch: refs/heads/trunk Commit: 9a53c3699b52a0bbeb0f723ac409ac189aa00f7f Parents: 9cbb2c5 b38e52b Author: arp <a...@apache.org> Authored: Sun Sep 28 20:42:56 2014 -0700 Committer: arp <a...@apache.org> Committed: Sun Sep 28 20:42:56 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++ .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 3 ++ .../hdfs/server/namenode/FSNamesystem.java | 28 +++++++++- .../org/apache/hadoop/hdfs/tools/DFSck.java | 3 +- .../src/main/resources/hdfs-default.xml | 8 +++ .../src/site/apt/HDFSCommands.apt.vm | 56 +++++++++++--------- .../hadoop/hdfs/TestBlockStoragePolicy.java | 35 ++++++++++++ 7 files changed, 110 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a53c369/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a53c369/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a53c369/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml ----------------------------------------------------------------------