Home Explore Help
Register Sign In
apache
/
hadoop
mirror of https://github.com/apache/hadoop.git
2
0
Fork 1
Files Issues 0 Wiki
Browse Source

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591099 13f79535-47bb-0310-9956-ffa450edef68
Arpit Agarwal 11 years ago
parent
a325ab0e59
commit
fa889d0ef6
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 3 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  2. 0 3
      hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt
View File 

@@ -99,6 +99,9 @@ Release 2.5.0 - UNRELEASED
 
     HADOOP-10508. RefreshCallQueue fails when authorization is enabled.
 
     (Chris Li via wheat9)
 
 
+    HADOOP-10547. Give SaslPropertiesResolver.getDefaultProperties() public
 
+    scope. (Benoy Antony via Arpit Agarwal)
 
+
 
 Release 2.4.1 - UNRELEASED
 
 
   INCOMPATIBLE CHANGES

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

@@ -165,9 +165,6 @@ Release 2.5.0 - UNRELEASED
 
 
     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
 
 
   INCOMPATIBLE CHANGES