diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java index aadbf4b9c97..c4fc965a956 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java @@ -80,7 +80,7 @@ public class SaslPropertiesResolver implements Configurable{ * The default Sasl Properties read from the configuration * @return sasl Properties */ - protected Map getDefaultProperties() { + public Map getDefaultProperties() { return properties; } diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index ced13ce3588..139d9b1a3d1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -415,6 +415,9 @@ Release 2.5.0 - UNRELEASED HDFS-6288. DFSInputStream Pread doesn't update ReadStatistics. (Juan Yu via wang) + HADOOP-10547. Give SaslPropertiesResolver.getDefaultProperties() public + scope. (Benoy Antony via Arpit Agarwal) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES