svn merge -c 1095121 from trunk for HADOOP-7231.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1126772 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -48,6 +48,8 @@ Trunk (unreleased changes)
     HADOOP-7216. Add FsCommand.runAll() with deprecated annotation for the
     transition of Command base class improvement.  (Daryn Sharp via szetszwo)
 
+    HADOOP-7231. Fix synopsis for -count. (Daryn Sharp via eli).
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/java/org/apache/hadoop/fs/shell/Count.java

@@ -43,7 +43,7 @@ public class Count extends FsCommand {
   }
 
   public static final String NAME = "count";
-  public static final String USAGE = "-" + NAME + "[-q] <path>";
+  public static final String USAGE = "-" + NAME + " [-q] <path> ...";
   public static final String DESCRIPTION = CommandUtils.formatDescription(USAGE, 
       "Count the number of directories, files and bytes under the paths",
       "that match the specified file pattern.  The output columns are:",

src/test/core/org/apache/hadoop/cli/testConf.xml

@@ -222,7 +222,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-count\[-q\] &lt;path&gt;: Count the number of directories, files and bytes under the paths( )*</expected-output>
+          <expected-output>^-count \[-q\] &lt;path&gt; \.\.\.: Count the number of directories, files and bytes under the paths( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>