diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0d7a843156a..43b19ec5153 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -197,6 +197,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 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 10ba832d54b..55073c53e0f 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