You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zh...@apache.org on 2015/01/12 19:19:08 UTC
[26/34] hadoop git commit: YARN-2956. Added missing links in YARN
documentation. Contributed by Masatake Iwasaki
YARN-2956. Added missing links in YARN documentation. Contributed by Masatake Iwasaki
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ce3d0c13
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce3d0c13
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce3d0c13
Branch: refs/heads/HDFS-EC
Commit: ce3d0c1367e5116ed01fc4adc852a8af35f3a659
Parents: 4febc24
Author: Jian He <ji...@apache.org>
Authored: Fri Jan 9 17:46:36 2015 -0800
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Jan 12 10:18:02 2015 -0800
----------------------------------------------------------------------
hadoop-project/src/site/site.xml | 3 ++
hadoop-yarn-project/CHANGES.txt | 3 ++
.../hadoop-yarn-site/src/site/apt/index.apt.vm | 48 ++++++++++++++------
3 files changed, 39 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce3d0c13/hadoop-project/src/site/site.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
index aec33d6..637f7eb 100644
--- a/hadoop-project/src/site/site.xml
+++ b/hadoop-project/src/site/site.xml
@@ -113,6 +113,7 @@
</menu>
<menu name="YARN" inherit="top">
+ <item name="Overview" href="hadoop-yarn/hadoop-yarn-site/index.html"/>
<item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
<item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
<item name="Fair Scheduler" href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/>
@@ -126,6 +127,8 @@
<item name="NodeManager Restart" href="hadoop-yarn/hadoop-yarn-site/NodeManagerRestart.html"/>
<item name="DockerContainerExecutor" href="hadoop-yarn/hadoop-yarn-site/DockerContainerExecutor.html"/>
<item name="Using CGroups" href="hadoop-yarn/hadoop-yarn-site/NodeManagerCGroups.html"/>
+ <item name="Secure Containers" href="hadoop-yarn/hadoop-yarn-site/SecureContainer.html"/>
+ <item name="Registry" href="hadoop-yarn/hadoop-yarn-site/registry/index.html"/>
</menu>
<menu name="YARN REST APIs" inherit="top">
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce3d0c13/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index bcd3c5b..2cc3049 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -174,6 +174,9 @@ Release 2.7.0 - UNRELEASED
YARN-2996. Improved synchronization and I/O operations of FS- and Mem-
RMStateStore. (Yi Liu via zjshen)
+ YARN-2956. Added missing links in YARN documentation. (Masatake Iwasaki via
+ jianhe)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce3d0c13/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
index 79b8e11..43e5b02 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
@@ -36,29 +36,47 @@ MapReduce NextGen aka YARN aka MRv2
library and is tasked with negotiating resources from the ResourceManager and
working with the NodeManager(s) to execute and monitor the tasks.
- More details are available in the {{{./YARN.html}YARN}}
- document.
+ More details are available in the {{{./YARN.html}Architecture}} document.
-* Documentation
- * {{{./YARN.html}NextGen MapReduce}}
-
- * {{{./WritingYarnApplications.html}Writing YARN Applications}}
+Documentation Index
- * {{{./CapacityScheduler.html}Capacity Scheduler}}
+* YARN
+ * {{{./YARN.html}YARN Architecture}}
+
+ * {{{./CapacityScheduler.html}Capacity Scheduler}}
+
* {{{./FairScheduler.html}Fair Scheduler}}
-
+
+ * {{{./ResourceManagerRestart.htaml}ResourceManager Restart}}
+
+ * {{{./ResourceManagerHA.html}ResourceManager HA}}
+
* {{{./WebApplicationProxy.html}Web Application Proxy}}
-
+
* {{{./TimelineServer.html}YARN Timeline Server}}
-
- * {{{./SecureContainer.html}YARN Secure Containers}}
+
+ * {{{./WritingYarnApplications.html}Writing YARN Applications}}
+
+ * {{{./YarnCommands.html}YARN Commands}}
+
+ * {{{hadoop-sls/SchedulerLoadSimulator.html}Scheduler Load Simulator}}
+
+ * {{{./NodeManagerRestart.html}NodeManager Restart}}
+
+ * {{{./DockerContainerExecutor.html}DockerContainerExecutor}}
+
+ * {{{./NodeManagerCGroups.html}Using CGroups}}
+
+ * {{{./SecureContainer.html}Secure Containers}}
+
+ * {{{./registry/index.html}Registry}}
- * {{{../../hadoop-project-dist/hadoop-common/CLIMiniCluster.html}CLI MiniCluster}}
+* YARN REST APIs
- * {{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html}Backward Compatibility between Apache Hadoop 1.x and 2.x for MapReduce}}
+ * {{{./WebServicesIntro.html}Introduction}}
- * {{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html}Encrypted Shuffle}}
+ * {{{./ResourceManagerRest.html}Resource Manager}}
- * {{{./registry/index.html}Registry}}
+ * {{{./NodeManagerRest.html}Node Manager}}