HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet Houghland.

(cherry picked from commit 05adc76ace)

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -70,6 +70,8 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11328. ZKFailoverController does not log Exception when doRun raises
     errors. (Tianyin Xu via ozawa)
 
+    HADOOP-11120. hadoop fs -rmr gives wrong advice. (Juliet Hougland via wang)
+
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java

@@ -141,7 +141,7 @@ protected void processOptions(LinkedList<String> args) throws IOException {
 
     @Override
     public String getReplacementCommand() {
-      return "rm -r";
+      return "-rm -r";
     }
   }
 

hadoop-common-project/hadoop-common/src/test/resources/testConf.xml

@@ -429,7 +429,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^\s*\(DEPRECATED\) Same as 'rm -r'\s*</expected-output>
+          <expected-output>^\s*\(DEPRECATED\) Same as '-rm -r'\s*</expected-output>
         </comparator>
       </comparators>
     </test>