You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/06/03 11:52:22 UTC
[2/3] hadoop git commit: HDFS-8523. Remove usage information on
unsupported operation 'fsck -showprogress' from branch-2 (Contributed by
J.Andreina)
HDFS-8523. Remove usage information on unsupported operation 'fsck -showprogress' from branch-2 (Contributed by J.Andreina)
(cherry picked from commit 0ed9c2d8fec93b5dac9c305eda272ad8dfd869a9)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd98cfd3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd98cfd3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd98cfd3
Branch: refs/heads/branch-2.7
Commit: dd98cfd328dddb01a1220786d28a80195021611b
Parents: 8090a6e
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Jun 3 15:15:44 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Wed Jun 3 15:18:42 2015 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop-hdfs/src/site/markdown/HDFSCommands.md | 5 ++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd98cfd3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index f5f9e8b..2731141 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -102,6 +102,9 @@ Release 2.7.1 - UNRELEASED
HDFS-8270. create() always retried with hardcoded timeout when file already
exists with open lease (J.Andreina via vinayakumarb)
+ HDFS-8523. Remove usage information on unsupported operation
+ "fsck -showprogress" from branch-2 (J.Andreina via vinayakumarb)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd98cfd3/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
index 5fdfb0c..4b4e50c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
@@ -1,4 +1,4 @@
-<!---
+<!---
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -100,7 +100,7 @@ Usage:
[-list-corruptfileblocks |
[-move | -delete | -openforwrite]
[-files [-blocks [-locations | -racks]]]
- [-includeSnapshots] [-showprogress]
+ [-includeSnapshots]
| COMMAND\_OPTION | Description |
|:---- |:---- |
@@ -114,7 +114,6 @@ Usage:
| `-list-corruptfileblocks` | Print out list of missing blocks and files they belong to. |
| `-move` | Move corrupted files to /lost+found. |
| `-openforwrite` | Print out files opened for write. |
-| `-showprogress` | Print out dots for progress in output. Default is OFF (no progress). |
Runs the HDFS filesystem checking utility. See [fsck](./HdfsUserGuide.html#fsck) for more info.