diff --git a/CHANGES.txt b/CHANGES.txt index 1d419aeb1b..9447d6befc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -381,6 +381,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(..). diff --git a/src/java/org/apache/hadoop/fs/FsShell.java b/src/java/org/apache/hadoop/fs/FsShell.java index ea163f5c36..e3b5c03e27 100644 --- a/src/java/org/apache/hadoop/fs/FsShell.java +++ b/src/java/org/apache/hadoop/fs/FsShell.java @@ -1436,7 +1436,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" + diff --git a/src/test/core/org/apache/hadoop/cli/testConf.xml b/src/test/core/org/apache/hadoop/cli/testConf.xml index 5603ca8ff3..66fd40c664 100644 --- a/src/test/core/org/apache/hadoop/cli/testConf.xml +++ b/src/test/core/org/apache/hadoop/cli/testConf.xml @@ -610,7 +610,7 @@ RegexpComparator - ^( |\t)*The -f option shows apended data as the file grows.( )* + ^( |\t)*The -f option shows appended data as the file grows.( )*