From d7170579ea334cc3ba383d504824d9174cff47f3 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Date: Fri, 16 Sep 2011 10:10:38 +0000
Subject: [PATCH] MAPREDUCE-2994. svn merge -c r1171485 --ignore-ancestry
 ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171486 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                           | 3 +++
 .../src/main/java/org/apache/hadoop/yarn/util/Apps.java        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 5744932d9fb..daf9b4095f6 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -1314,6 +1314,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-1664. Changes the behaviour of the combination of job-acls
     when they function together with queue-acls. (Ravi Gummadi via vinodkv)
 
+    MAPREDUCE-2994. Fixed a bug in ApplicationID parsing that affects RM
+    UI. (Devaraj K via vinodkv)
+
   NEW FEATURES
 
     MAPREDUCE-1804. Stress-test tool for HDFS introduced in HDFS-708.
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
index 90e181576c9..b5fca9f00bf 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
@@ -30,7 +30,7 @@
  * Yarn application related utilities
  */
 public class Apps {
-  public static final String APP = "app";
+  public static final String APP = "application";
   public static final String ID = "ID";
 
   public static ApplicationId toAppID(String aid) {