Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E60B4659 for ; Mon, 23 May 2011 21:55:33 +0000 (UTC) Received: (qmail 47640 invoked by uid 500); 23 May 2011 21:55:33 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 47609 invoked by uid 500); 23 May 2011 21:55:33 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 47602 invoked by uid 99); 23 May 2011 21:55:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 21:55:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 21:55:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 67520238890A; Mon, 23 May 2011 21:55:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1126772 - in /hadoop/common/branches/yahoo-merge: ./ CHANGES.txt src/contrib/ec2/ src/docs/ src/java/ src/java/org/apache/hadoop/fs/shell/Count.java src/test/core/ src/test/core/org/apache/hadoop/cli/testConf.xml Date: Mon, 23 May 2011 21:55:11 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110523215511.67520238890A@eris.apache.org> Author: szetszwo Date: Mon May 23 21:55:10 2011 New Revision: 1126772 URL: http://svn.apache.org/viewvc?rev=1126772&view=rev Log: svn merge -c 1095121 from trunk for HADOOP-7231. Modified: hadoop/common/branches/yahoo-merge/ (props changed) hadoop/common/branches/yahoo-merge/CHANGES.txt (contents, props changed) hadoop/common/branches/yahoo-merge/src/contrib/ec2/ (props changed) hadoop/common/branches/yahoo-merge/src/docs/ (props changed) hadoop/common/branches/yahoo-merge/src/java/ (props changed) hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java hadoop/common/branches/yahoo-merge/src/test/core/ (props changed) hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml Propchange: hadoop/common/branches/yahoo-merge/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:55:10 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1100026 +/hadoop/common/trunk:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1095121,1100026 /hadoop/core/branches/branch-0.19/core:713112 Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1126772&r1=1126771&r2=1126772&view=diff ============================================================================== --- hadoop/common/branches/yahoo-merge/CHANGES.txt (original) +++ hadoop/common/branches/yahoo-merge/CHANGES.txt Mon May 23 21:55:10 2011 @@ -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 Propchange: hadoop/common/branches/yahoo-merge/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:55:10 2011 @@ -1,4 +1,4 @@ -/hadoop/common/trunk/CHANGES.txt:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1092832,1094750,1100026 +/hadoop/common/trunk/CHANGES.txt:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1092832,1094750,1095121,1100026 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278 Propchange: hadoop/common/branches/yahoo-merge/src/contrib/ec2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:55:10 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/contrib/ec2:1043117,1078148,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1100026 +/hadoop/common/trunk/src/contrib/ec2:1043117,1078148,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1095121,1100026 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112 /hadoop/core/trunk/src/contrib/ec2:776175-784663 Propchange: hadoop/common/branches/yahoo-merge/src/docs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:55:10 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/src/docs:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1100026 +/hadoop/common/trunk/src/docs:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1095121,1100026 /hadoop/core/branches/branch-0.19/src/docs:713112 Propchange: hadoop/common/branches/yahoo-merge/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:55:10 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/java:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1100026 +/hadoop/common/trunk/src/java:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1095121,1100026 /hadoop/core/branches/branch-0.19/core/src/java:713112 /hadoop/core/trunk/src/core:776175-785643,785929-786278 Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java?rev=1126772&r1=1126771&r2=1126772&view=diff ============================================================================== --- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java (original) +++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java Mon May 23 21:55:10 2011 @@ -43,7 +43,7 @@ public class Count extends FsCommand { } public static final String NAME = "count"; - public static final String USAGE = "-" + NAME + "[-q] "; + public static final String USAGE = "-" + NAME + " [-q] ..."; 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:", Propchange: hadoop/common/branches/yahoo-merge/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:55:10 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1100026 +/hadoop/common/trunk/src/test/core:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1091902,1091970,1092565,1094750,1095121,1100026 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278 Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml?rev=1126772&r1=1126771&r2=1126772&view=diff ============================================================================== --- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml (original) +++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml Mon May 23 21:55:10 2011 @@ -222,7 +222,7 @@ RegexpComparator - ^-count\[-q\] <path>: Count the number of directories, files and bytes under the paths( )* + ^-count \[-q\] <path> \.\.\.: Count the number of directories, files and bytes under the paths( )* RegexpComparator