You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2011/04/19 17:48:55 UTC
svn commit: r1095121 - in /hadoop/common/trunk: CHANGES.txt
src/java/org/apache/hadoop/fs/shell/Count.java
src/test/core/org/apache/hadoop/cli/testConf.xml
Author: eli
Date: Tue Apr 19 15:48:55 2011
New Revision: 1095121
URL: http://svn.apache.org/viewvc?rev=1095121&view=rev
Log:
HADOOP-7231. Fix synopsis for -count. Contributed by Daryn Sharp.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/Count.java
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/testConf.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1095121&r1=1095120&r2=1095121&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Apr 19 15:48:55 2011
@@ -150,6 +150,7 @@ Trunk (unreleased changes)
HADOOP-7223. FileContext createFlag combinations are not clearly defined.
(suresh)
+ HADOOP-7231. Fix synopsis for -count. (Daryn Sharp via eli).
Release 0.22.0 - Unreleased
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/Count.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/Count.java?rev=1095121&r1=1095120&r2=1095121&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/Count.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/Count.java Tue Apr 19 15:48:55 2011
@@ -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:",
Modified: hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/testConf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/testConf.xml?rev=1095121&r1=1095120&r2=1095121&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/testConf.xml (original)
+++ hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/testConf.xml Tue Apr 19 15:48:55 2011
@@ -222,7 +222,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^-count\[-q\] <path>: Count the number of directories, files and bytes under the paths( )*</expected-output>
+ <expected-output>^-count \[-q\] <path> \.\.\.: Count the number of directories, files and bytes under the paths( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>