Repository: hadoop Updated Branches: refs/heads/branch-2 b8e4fffa4 -> 2ebd1bc65
YARN-2461. Fix PROCFS_USE_SMAPS_BASED_RSS_ENABLED property in YarnConfiguration. (rchiang via rkanter) (cherry picked from commit 3c72f54ef581b4f3e2eb84e1e24e459c38d3f769) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ebd1bc6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ebd1bc6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ebd1bc6 Branch: refs/heads/branch-2 Commit: 2ebd1bc654a39a5deb5c7e4e01d8e4ff78934cd1 Parents: b8e4fff Author: Robert Kanter <[email protected]> Authored: Fri Dec 5 12:07:01 2014 -0800 Committer: Robert Kanter <[email protected]> Committed: Fri Dec 5 12:10:20 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ebd1bc6/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index adb242e..3a39a42 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -159,6 +159,9 @@ Release 2.7.0 - UNRELEASED YARN-2874. Dead lock in "DelegationTokenRenewer" which blocks RM to execute any further apps. (Naganarasimha G R via kasha) + YARN-2461. Fix PROCFS_USE_SMAPS_BASED_RSS_ENABLED property in + YarnConfiguration. (rchiang via rkanter) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ebd1bc6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 30468f3..1a8ddaf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -819,7 +819,7 @@ public class YarnConfiguration extends Configuration { public static final String NM_CONTAINER_MON_PROCESS_TREE = NM_PREFIX + "container-monitor.process-tree.class"; public static final String PROCFS_USE_SMAPS_BASED_RSS_ENABLED = NM_PREFIX + - ".container-monitor.procfs-tree.smaps-based-rss.enabled"; + "container-monitor.procfs-tree.smaps-based-rss.enabled"; public static final boolean DEFAULT_PROCFS_USE_SMAPS_BASED_RSS_ENABLED = false;
