From 29747001f0dc93011b059d356b315d8992c1aab8 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Thu, 7 Jan 2016 14:39:36 +0000 Subject: [PATCH] HADOOP-12675. Fix description about retention period in usage of expunge command. (Masatake Iwasaki via stevel) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/site/markdown/FileSystemShell.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 44f561ab60b..b88c2adc30e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -934,6 +934,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 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 990fd445f9b..685e9545039 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,