diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 010ba3c330a..d3d8c7be3bd 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -38,6 +38,9 @@ Release 2.7.2 - UNRELEASED HADOOP-10365. BufferedOutputStream in FileUtil#unpackEntries() should be closed in finally block. (Kiran Kumar M R and Sanghyun Yun via ozawa) + HADOOP-12006. Remove unimplemented option for `hadoop fs -ls` from + document in branch-2.7. (Akira AJISAKA via ozawa) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md index 494ad71e08c..4f27e24f937 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md @@ -391,17 +391,13 @@ Return usage output. ls ---- -Usage: `hadoop fs -ls [-d] [-h] [-R] [-t] [-S] [-r] [-u] ` +Usage: `hadoop fs -ls [-d] [-h] [-R] ` Options: * -d: Directories are listed as plain files. * -h: Format file sizes in a human-readable fashion (eg 64.0m instead of 67108864). * -R: Recursively list subdirectories encountered. -* -t: Sort output by modification time (most recent first). -* -S: Sort output by file size. -* -r: Reverse the sort order. -* -u: Use access time rather than modification time for display and sorting. For a file ls returns stat on the file with the following format: