Repository: hadoop Updated Branches: refs/heads/branch-2.7 139fd21c8 -> d09ddb789
HADOOP-12006. Remove unimplemented option for from document in branch-2.7. Contributed by Akira AJISAKA. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d09ddb78 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d09ddb78 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d09ddb78 Branch: refs/heads/branch-2.7 Commit: d09ddb78984892476a18ec9757ea8decbe46839d Parents: 139fd21 Author: Tsuyoshi Ozawa <[email protected]> Authored: Thu Sep 3 23:07:40 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Thu Sep 3 23:07:40 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/site/markdown/FileSystemShell.md | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d09ddb78/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 010ba3c..d3d8c7b 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/d09ddb78/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md ---------------------------------------------------------------------- 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 494ad71..4f27e24 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] <args> ` +Usage: `hadoop fs -ls [-d] [-h] [-R] <args> ` 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:
