HDFS-5139. Merge r1525665 from trunk to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525667 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -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