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 ar...@apache.org on 2016/01/07 23:41:59 UTC
[42/50] [abbrv] hadoop git commit: HADOOP-12675. Fix description
about retention period in usage of expunge command. (Masatake Iwasaki via
stevel)
HADOOP-12675. Fix description about retention period in usage of expunge command. (Masatake Iwasaki via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/21bededd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/21bededd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/21bededd
Branch: refs/heads/HDFS-1312
Commit: 21bededd2fc2442459360dcc80a150fdd53e82f3
Parents: 07d1cb6
Author: Steve Loughran <st...@apache.org>
Authored: Thu Jan 7 14:39:36 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Jan 7 14:40:09 2016 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../hadoop-common/src/site/markdown/FileSystemShell.md | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/21bededd/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 4631165..d395b8a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1561,6 +1561,9 @@ Release 2.8.0 - UNRELEASED
address case of potential data loss due to partial copy
(Gaurav Kanade via cnauroth)
+ HADOOP-12675. Fix description about retention period in usage of expunge
+ command. (Masatake Iwasaki via stevel)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/21bededd/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 e0a6eb0..db8b785 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
@@ -280,7 +280,7 @@ from trash directory, and create new checkpoint.
When checkpoint is created,
recently deleted files in trash are moved under the checkpoint.
-Files in checkpoints older than `fs.trash.checkpoint.interval`
+Files in checkpoints older than `fs.trash.interval`
will be permanently deleted on the next invocation of `-expunge` command.
If the file system supports the feature,