Author: arp
Date: Tue Apr 29 20:43:42 2014
New Revision: 1591099
URL: http://svn.apache.org/r1591099
Log:
HADOOP-10547: Merging r1591098 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1591099&r1=1591098&r2=1591099&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Apr 29 20:43:42 2014
@@ -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
