refs/heads/branch-0.23.5 - hadoop

commit	12444f2ea89d56b1aab95e97948e89374502e39a	[log] [tgz]
author	Thomas White <tomwhite@apache.org>	Tue Nov 20 18:00:40 2012 +0000
committer	Thomas White <tomwhite@apache.org>	Tue Nov 20 18:00:40 2012 +0000
tree	238ac9a372ba8de925589b2c2744b92aa6be3486
parent	43edc5423ffc9b546958a11832198cd69fcfab28 [diff]

Merge -r 1411761:1411762 from trunk to branch-0.23.5. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.5@1411771 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt[diff]
hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm[Renamed from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm - diff]
hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm[Renamed from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm - diff]
hadoop-common-project/hadoop-common/src/site/resources/css/site.css[Added - diff]
hadoop-common-project/hadoop-common/src/site/site.xml[Added - diff]
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/resources/css/site.css[Added - diff]
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm[Renamed from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm - diff]
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm[Renamed from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebHDFS.apt.vm - diff]
hadoop-hdfs-project/hadoop-hdfs/src/site/resources/css/site.css[Added - diff]
hadoop-hdfs-project/hadoop-hdfs/src/site/site.xml[Added - diff]
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/resources/css/site.css[Added - diff]
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/site.xml[Added - diff]
hadoop-project/src/site/apt/index.apt.vm[diff]
hadoop-project/src/site/site.xml[diff]

14 files changed

tree: 238ac9a372ba8de925589b2c2744b92aa6be3486