Author: suresh Date: Mon Mar 3 22:08:49 2014 New Revision: 1573776 URL: http://svn.apache.org/r1573776 Log: HADOOP-10378. Typo in help printed by hdfs dfs -help. Contributed by Mit Desai.
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1573776&r1=1573775&r2=1573776&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar 3 22:08:49 2014 @@ -315,6 +315,9 @@ Release 2.5.0 - UNRELEASED BUG FIXES + HADOOP-10378. Typo in help printed by hdfs dfs -help. + (Mit Desai via suresh) + Release 2.4.0 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java?rev=1573776&r1=1573775&r2=1573776&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java Mon Mar 3 22:08:49 2014 @@ -48,7 +48,7 @@ public class Count extends FsCommand { "Count the number of directories, files and bytes under the paths\n" + "that match the specified file pattern. The output columns are:\n" + "DIR_COUNT FILE_COUNT CONTENT_SIZE FILE_NAME or\n" + - "QUOTA REMAINING_QUATA SPACE_QUOTA REMAINING_SPACE_QUOTA \n" + + "QUOTA REMAINING_QUOTA SPACE_QUOTA REMAINING_SPACE_QUOTA \n" + " DIR_COUNT FILE_COUNT CONTENT_SIZE FILE_NAME"; private boolean showQuotas; Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml?rev=1573776&r1=1573775&r2=1573776&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml Mon Mar 3 22:08:49 2014 @@ -234,7 +234,7 @@ </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^( |\t)*QUOTA REMAINING_QUATA SPACE_QUOTA REMAINING_SPACE_QUOTA( )*</expected-output> + <expected-output>^( |\t)*QUOTA REMAINING_QUOTA SPACE_QUOTA REMAINING_SPACE_QUOTA( )*</expected-output> </comparator> <comparator> <type>RegexpComparator</type>