HADOOP-7664. Merging change r1182645 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610875 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
313e9f4a9b
commit
7da8724ade
|
@ -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
|
||||
|
|
|
@ -2364,7 +2364,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
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.");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue