From 871d81060d07524de84e6d77710d249405844ed6 Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Tue, 29 Apr 2014 20:38:36 +0000
Subject: [PATCH] HADOOP-10547. Give
 SaslPropertiesResolver.getDefaultProperties() public scope. (Contributed by
 Benoy Antony)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1591095 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/hadoop/security/SaslPropertiesResolver.java     | 2 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 aadbf4b9c9..c4fc965a95 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 Configuration getConf() {
    * The default Sasl Properties read from the configuration
    * @return sasl Properties
    */
-  protected Map<String,String> getDefaultProperties() {
+  public Map<String,String> getDefaultProperties() {
     return properties;
   }
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ced13ce358..139d9b1a3d 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