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/368e2423 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/368e2423 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/368e2423 Branch: refs/heads/HDFS-6581 Commit: 368e2423a57702a264ec2e2a0bea4b2fef05fbf8 Parents: 7f0422b 0577eb3 Author: arp <a...@apache.org> Authored: Mon Sep 29 20:09:06 2014 -0700 Committer: arp <a...@apache.org> Committed: Mon Sep 29 20:09:06 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 4 ++++ .../hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm | 6 ++++++ 3 files changed, 13 insertions(+) ----------------------------------------------------------------------
