HADOOP-6819. svn merge -c 962914 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@962916 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -908,6 +908,10 @@ Release 0.21.0 - 2010-07-01
 
   BUG FIXES
 
+    HADOOP-6819. [Herriot] Shell command for getting the new exceptions in
+    the logs returning exitcode 1 after executing successfully. (Vinay Thota
+    via cos)
+
     HADOOP-6847. Problem staging 0.21.0 artifacts to Apache Nexus Maven
     Repository (Giridharan Kesavan via cos)
 

src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj

@@ -264,7 +264,7 @@ public aspect DaemonProtocolAspect {
         if (index++ < list.length -1) {
            filterExpPattern.append("grep -v " + excludeExp + " | ");
         } else {
-           filterExpPattern.append("grep -vc " + excludeExp);
+           filterExpPattern.append("grep -v " + excludeExp + " | wc -l");
         }
       }
       cmd = new String[] {