svn merge -c 1096522 from trunk for HADOOP-7241.

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

CHANGES.txt

@@ -254,6 +254,9 @@ Release 0.22.0 - Unreleased
     HADOOP-7187. Fix socket leak in GangliaContext.  (Uma Maheswara Rao G
     via szetszwo)
 
+    HADOOP-7241. fix typo of command 'hadoop fs -help tail'. 
+    (Wei Yongjun via eli)
+
   OPTIMIZATIONS
 
     HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).

src/java/org/apache/hadoop/fs/FsShell.java

@@ -1423,7 +1423,7 @@ public class FsShell extends Configured implements Tool {
 
     String tail = TAIL_USAGE
       + ":  Show the last 1KB of the file. \n"
-      + "\t\tThe -f option shows apended data as the file grows. \n";
+      + "\t\tThe -f option shows appended data as the file grows. \n";
 
     String chmod = FsShellPermissions.CHMOD_USAGE + "\n" +
       "\t\tChanges permissions of a file.\n" +

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

@@ -610,7 +610,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^( |\t)*The -f option shows apended data as the file grows.( )*</expected-output>
+          <expected-output>^( |\t)*The -f option shows appended data as the file grows.( )*</expected-output>
         </comparator>
       </comparators>
     </test>