Author: vinodkv
Date: Wed Mar 26 02:54:00 2014
New Revision: 1581657

URL: http://svn.apache.org/r1581657
Log:
YARN-1452. Added documentation about the configuration and usage of generic 
application history and the timeline data service. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1581656 ../../trunk/

Added:
    
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
      - copied unchanged from r1581656, 
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
Modified:
    hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
    
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm

Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1581657&r1=1581656&r2=1581657&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Mar 26 
02:54:00 2014
@@ -311,6 +311,9 @@ Release 2.4.0 - UNRELEASED
     YARN-1850. Introduced the ability to optionally disable sending out 
timeline-
     events in the TimelineClient. (Zhijie Shen via vinodkv)
 
+    YARN-1452. Added documentation about the configuration and usage of generic
+    application history and the timeline data service. (Zhijie Shen via 
vinodkv)
+
   OPTIMIZATIONS
 
     YARN-1771. Reduce the number of NameNode operations during localization of

Modified: 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1581657&r1=1581656&r2=1581657&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
 Wed Mar 26 02:54:00 2014
@@ -1105,7 +1105,7 @@
     <description>This is default address for the timeline server to start the
     RPC server.</description>
     <name>yarn.timeline-service.address</name>
-    <value>0.0.0.0:10200</value>
+    <value>${yarn.timeline-service.hostname}:10200</value>
   </property>
 
   <property>

Modified: 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm?rev=1581657&r1=1581656&r2=1581657&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
 Wed Mar 26 02:54:00 2014
@@ -43,7 +43,7 @@ MapReduce NextGen aka YARN aka MRv2
 
   * {{{./YARN.html}NextGen MapReduce}}
   
-  * {{{./WritingYarnApplications.html}Writing Yarn Applications}}
+  * {{{./WritingYarnApplications.html}Writing YARN Applications}}
 
   * {{{./CapacityScheduler.html}Capacity Scheduler}}
 
@@ -51,6 +51,8 @@ MapReduce NextGen aka YARN aka MRv2
 
   * {{{./WebApplicationProxy.html}Web Application Proxy}}
 
+  * {{{./TimelineServer.html}YARN Timeline Server}}
+
   * {{{../../hadoop-project-dist/hadoop-common/CLIMiniCluster.html}CLI 
MiniCluster}}
 
   * 
{{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html}Backward
 Compatibility between Apache Hadoop 1.x and 2.x for MapReduce}}


Reply via email to