You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2014/11/13 22:21:06 UTC
hadoop git commit: Revert "YARN-2603. ApplicationConstants missing
HADOOP_MAPRED_HOME (Ray Chiang via aw)"
Repository: hadoop
Updated Branches:
refs/heads/trunk 9ff7315cb -> 4ae9780e6
Revert "YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via aw)"
This reverts commit b0a9cd37ab9ef45ed9a71b04f1634fa54dd4c438.
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ae9780e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ae9780e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ae9780e
Branch: refs/heads/trunk
Commit: 4ae9780e6a05bfd6b93f1c871c22761ddd8b19cb
Parents: 9ff7315
Author: Vinod Kumar Vavilapalli <vi...@apache.org>
Authored: Thu Nov 13 13:17:11 2014 -0800
Committer: Vinod Kumar Vavilapalli <vi...@apache.org>
Committed: Thu Nov 13 13:17:11 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/4ae9780e/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3235907..60f88ca 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -81,9 +81,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/4ae9780e/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"),