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/5a5a7da3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5a5a7da3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5a5a7da3 Branch: refs/heads/trunk Commit: 5a5a7da3a3564c6adf08f4f775cc4c0b4ec02645 Parents: 364e60b 6c54308 Author: arp <a...@apache.org> Authored: Thu Sep 25 12:55:59 2014 -0700 Committer: arp <a...@apache.org> Committed: Thu Sep 25 12:55:59 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 + .../apache/hadoop/hdfs/TestLeaseRecovery.java | 143 ++++++++++--------- .../org/apache/hadoop/hdfs/TestSafeMode.java | 9 +- hadoop-mapreduce-project/CHANGES.txt | 5 + .../src/site/markdown/DistCp.md.vm | 10 +- .../apache/hadoop/tools/DistCpOptionSwitch.java | 2 +- 6 files changed, 93 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
