From ef096599c3c0a656da0d33bbe861d81e73ec7c9f Mon Sep 17 00:00:00 2001
From: Zhijie Shen <zjshen@apache.org>
Date: Fri, 8 May 2015 16:39:49 -0700
Subject: [PATCH] YARN-2206. Updated document for applications REST API
 response examples. Contributed by Kenji Kikushima and Brahma Reddy Battula.

(cherry picked from commit 08f0ae403c649b28925d3b339b7b6de1d7ec2c0c)
---
 hadoop-yarn-project/CHANGES.txt                             | 3 +++
 .../src/site/markdown/ResourceManagerRest.md                | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d9d986e52c7..260dd12132c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -334,6 +334,9 @@ Release 2.8.0 - UNRELEASED
 
     YARN-3473. Fix RM Web UI configuration for some properties (rchiang via rkanter)
 
+    YARN-2206. Updated document for applications REST API response examples. (Kenji
+    Kikushima and Brahma Reddy Battula via zjshen)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md
index d5df8ba21d4..c3fd9b8f534 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md
@@ -1369,6 +1369,8 @@ Response Body:
           "allocatedMB" : 0,
           "allocatedVCores" : 0,
           "runningContainers" : 0,
+	  "applicationType" : "MAPREDUCE",
+	  "applicationTags" : ""
           "memorySeconds" : 151730,
           "vcoreSeconds" : 103
        },
@@ -1392,6 +1394,8 @@ Response Body:
           "allocatedMB" : 0,
           "allocatedVCores" : 0,
           "runningContainers" : 1,
+	  "applicationType" : "YARN",
+	  "applicationTags" : "tag1"
           "memorySeconds" : 640064,
           "vcoreSeconds" : 442
        } 
@@ -1424,6 +1428,7 @@ Response Body:
     <user>user1</user>
     <name>word count</name>
     <applicationType>MAPREDUCE</applicationType>
+    <applicationTags></applicationTags>
     <queue>default</queue>
     <state>FINISHED</state>
     <finalStatus>SUCCEEDED</finalStatus>
@@ -1448,6 +1453,7 @@ Response Body:
     <user>user1</user>
     <name>Sleep job</name>
     <applicationType>YARN</applicationType>
+    <applicationTags>tag1</applicationTags>
     <queue>default</queue>
     <state>FINISHED</state>
     <finalStatus>SUCCEEDED</finalStatus>