diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 937eb1bdf2a..f4ca32ec3dc 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -12,6 +12,10 @@ Release 2.6.0 - UNRELEASED HADOOP-10815. Implement Windows equivalent of mlock. (cnauroth) + HADOOP-7664. Remove warmings when overriding final parameter configuration + if the override value is same as the final parameter value. + (Ravi Prakash via suresh) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 1e5bdb8b7ea..5149497617c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2364,7 +2364,7 @@ public class Configuration implements Iterable>, if (!finalParameters.contains(attr)) { properties.setProperty(attr, value); updatingResource.put(attr, source); - } else { + } else if (!value.equals(properties.getProperty(attr))) { LOG.warn(name+":an attempt to override final parameter: "+attr +"; Ignoring."); }