From 120e1decd7f6861e753269690d454cb14c240857 Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Sun, 7 Dec 2014 22:28:26 -0800 Subject: [PATCH] YARN-2927. [YARN-1492] InMemorySCMStore properties are inconsistent. (Ray Chiang via kasha) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0d7a843156..43b19ec515 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 10ba832d54..55073c53e0 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 @@ private static void addDeprecatedKeys() { // 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