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/d9639662 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9639662 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9639662 Branch: refs/heads/HDFS-6581 Commit: d96396627f9843ed81d86fe8ef7158da4e765728 Parents: a2d4eda 6b7673e Author: arp <[email protected]> Authored: Fri Sep 26 16:31:08 2014 -0700 Committer: arp <[email protected]> Committed: Fri Sep 26 16:31:08 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 15 + .../hadoop/util/GenericOptionsParser.java | 28 +- .../org/apache/hadoop/util/ProgramDriver.java | 1 - .../java/org/apache/hadoop/util/RunJar.java | 4 +- .../src/site/apt/CommandsManual.apt.vm | 2 +- .../src/site/apt/FileSystemShell.apt.vm | 55 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../src/site/apt/HdfsPermissionsGuide.apt.vm | 13 +- hadoop-mapreduce-project/CHANGES.txt | 10 + .../src/main/resources/mapred-default.xml | 4 +- .../src/site/apt/DistributedCacheDeploy.apt.vm | 14 +- .../mapred/pipes/TestPipeApplication.java | 2 +- .../src/site/markdown/GridMix.md.vm | 818 +++++++++++++++++++ .../hadoop-rumen/src/site/markdown/Rumen.md.vm | 397 +++++++++ hadoop-yarn-project/CHANGES.txt | 3 + .../src/site/apt/FairScheduler.apt.vm | 30 +- 16 files changed, 1329 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
