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 zj...@apache.org on 2015/06/08 19:19:08 UTC

[10/50] 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)

Merged CHANGES.txt from branch-2.7

(cherry picked from commit 0ed9c2d8fec93b5dac9c305eda272ad8dfd869a9)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md

(cherry picked from commit dd98cfd328dddb01a1220786d28a80195021611b)

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/6de67969
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6de67969
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6de67969

Branch: refs/heads/YARN-2928
Commit: 6de679697cc91d4a337d420b5e4e5ad994df150b
Parents: b8dd317
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Jun 3 15:15:44 2015 +0530
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Jun 8 09:43:13 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6de67969/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 8cbe0e5..3e25129 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -942,6 +942,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