From d35bcf207410f27a28ed78cd0f7511308a191f7c Mon Sep 17 00:00:00 2001
From: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Date: Thu, 13 Nov 2014 13:17:11 -0800
Subject: [PATCH] Revert "YARN-2603. ApplicationConstants missing
 HADOOP_MAPRED_HOME (Ray Chiang via aw)"

This reverts commit b0a9cd37ab9ef45ed9a71b04f1634fa54dd4c438.

Conflicts:
	hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 4ae9780e6a05bfd6b93f1c871c22761ddd8b19cb)
---
 hadoop-yarn-project/CHANGES.txt                              | 3 ---
 .../org/apache/hadoop/yarn/api/ApplicationConstants.java     | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 29348a6b572..e160e193be3 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -54,9 +54,6 @@ Release 2.7.0 - UNRELEASED
     YARN-2713. "RM Home" link in NM should point to one of the RMs in an 
     HA setup. (kasha)
 
-    YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via
-    aw)
-
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java
index 93438b4786c..d42cd67d85b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java
@@ -180,11 +180,6 @@ public interface ApplicationConstants {
      */
     HADOOP_HDFS_HOME("HADOOP_HDFS_HOME"),
     
-    /**
-     * $HADOOP_MAPRED_HOME
-     */
-    HADOOP_MAPRED_HOME("HADOOP_MAPRED_HOME"),
-    
     /**
      * $MALLOC_ARENA_MAX
      */