From 7a8e076ffb4e5e4a12514e3c95843dc89d377974 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Thu, 21 May 2015 23:14:44 +0900
Subject: [PATCH] YARN-3694. Fix dead link for TimelineServer REST API.
 Contributed by Jagadesh Kiran N.

(cherry picked from commit a5def580879428bc7af3c030ef33554e0519f072)
(cherry picked from commit 6d7e7ef1c4df613004f20911136db5be8b474265)
---
 hadoop-project/src/site/site.xml | 2 +-
 hadoop-yarn-project/CHANGES.txt  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
index efe0d18e24d..5bbce8a2689 100644
--- a/hadoop-project/src/site/site.xml
+++ b/hadoop-project/src/site/site.xml
@@ -134,7 +134,7 @@
       <item name="Introduction" href="hadoop-yarn/hadoop-yarn-site/WebServicesIntro.html"/>
       <item name="Resource Manager" href="hadoop-yarn/hadoop-yarn-site/ResourceManagerRest.html"/>
       <item name="Node Manager" href="hadoop-yarn/hadoop-yarn-site/NodeManagerRest.html"/>
-      <item name="Timeline Server" href="TimelineServer.html#Timeline_Server_REST_API_v1"/>
+      <item name="Timeline Server" href="hadoop-yarn/hadoop-yarn-site/TimelineServer.html#Timeline_Server_REST_API_v1"/>
     </menu>
     
     <menu name="Hadoop Compatible File Systems" inherit="top">
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6d97412eeba..4b325adcf47 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -112,6 +112,9 @@ Release 2.7.1 - UNRELEASED
     YARN-3609. Load node labels from storage inside RM serviceStart. (Wangda
     Tan via jianhe)
 
+    YARN-3694. Fix dead link for TimelineServer REST API.
+    (Jagadesh Kiran N via aajisaka)
+
 Release 2.7.0 - 2015-04-20
 
   INCOMPATIBLE CHANGES