Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10547: Merging r1591095 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591097 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-04-29 20:41:05 +00:00
parent 4c1f66d7fa
commit a325ab0e59
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java
View File

@ -80,7 +80,7 @@ public class SaslPropertiesResolver implements Configurable{
* The default Sasl Properties read from the configuration * The default Sasl Properties read from the configuration
* @return sasl Properties * @return sasl Properties
*/ */
protected Map<String,String> getDefaultProperties() { public Map<String,String> getDefaultProperties() {
return properties; return properties;
} }

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -165,6 +165,9 @@ Release 2.5.0 - UNRELEASED
HDFS-5892. TestDeleteBlockPool fails in branch-2. (Ted Yu via wheat9) HDFS-5892. TestDeleteBlockPool fails in branch-2. (Ted Yu via wheat9)
HADOOP-10547. Give SaslPropertiesResolver.getDefaultProperties() public
scope. (Benoy Antony via Arpit Agarwal)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES