Repository: hadoop Updated Branches: refs/heads/branch-2 308b75571 -> d02cb9c51
YARN-2927. [YARN-1492] InMemorySCMStore properties are inconsistent. (Ray Chiang via kasha) (cherry picked from commit 120e1decd7f6861e753269690d454cb14c240857) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d02cb9c5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d02cb9c5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d02cb9c5 Branch: refs/heads/branch-2 Commit: d02cb9c51213d3fec9fa3fce5043f8bff634ac36 Parents: 308b755 Author: Karthik Kambatla <[email protected]> Authored: Sun Dec 7 22:28:26 2014 -0800 Committer: Karthik Kambatla <[email protected]> Committed: Sun Dec 7 22:28:57 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/d02cb9c5/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 6271ae8..333ade1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -167,6 +167,9 @@ Release 2.7.0 - UNRELEASED YARN-2869. CapacityScheduler should trim sub queue names when parse configuration. (Wangda Tan via jianhe) + YARN-2927. [YARN-1492] InMemorySCMStore properties are inconsistent. + (Ray Chiang via kasha) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d02cb9c5/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 1a8ddaf..b15009e 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 @@ -1416,7 +1416,7 @@ public class YarnConfiguration extends Configuration { // In-memory SCM store configuration public static final String IN_MEMORY_STORE_PREFIX = - SHARED_CACHE_PREFIX + "in-memory."; + SCM_STORE_PREFIX + "in-memory."; /** * A resource in the InMemorySCMStore is considered stale if the time since
