hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject hadoop git commit: Revert "YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via aw)"
Date Thu, 13 Nov 2014 21:22:09 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 fc324d706 -> d35bcf207


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)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d35bcf20
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d35bcf20
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d35bcf20

Branch: refs/heads/branch-2
Commit: d35bcf207410f27a28ed78cd0f7511308a191f7c
Parents: fc324d7
Author: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Authored: Thu Nov 13 13:17:11 2014 -0800
Committer: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Committed: Thu Nov 13 13:21:46 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d35bcf20/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 29348a6..e160e19 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d35bcf20/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java
----------------------------------------------------------------------
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 93438b4..d42cd67 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
@@ -181,11 +181,6 @@ public interface ApplicationConstants {
     HADOOP_HDFS_HOME("HADOOP_HDFS_HOME"),
     
     /**
-     * $HADOOP_MAPRED_HOME
-     */
-    HADOOP_MAPRED_HOME("HADOOP_MAPRED_HOME"),
-    
-    /**
      * $MALLOC_ARENA_MAX
      */
     MALLOC_ARENA_MAX("MALLOC_ARENA_MAX"),


Mime
View raw message