Author: arp Date: Mon Sep 23 18:19:48 2013 New Revision: 1525667 URL: http://svn.apache.org/r1525667 Log: HDFS-5139. Merge r1525665 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=1525667&r1=1525666&r2=1525667&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 Mon Sep 23 18:19:48 2013 @@ -87,6 +87,8 @@ Release 2.2.0 - UNRELEASED BUG FIXES + HDFS-5139. Remove redundant -R option from setrep. + Release 2.1.1-beta - 2013-09-23 INCOMPATIBLE CHANGES