From 236c4ab511055d0b67d2c73160125cc63015ac07 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Tue, 1 Sep 2015 20:55:33 +0900 Subject: [PATCH] HADOOP-12359. hadoop fs -getmerge doc is wrong. Contributed by Jagadesh Kiran N. (cherry picked from commit 2e251a767427a38ecb6c309ad979feecb29a09f4) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/site/markdown/FileSystemShell.md | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index bb269c80478..7c12a474365 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -623,6 +623,9 @@ Release 2.7.2 - UNRELEASED HADOOP-12061. Incorrect command in single cluster setup document. (Kengo Seki via aajisaka) + HADOOP-12359. hadoop fs -getmerge doc is wrong. + (Jagadesh Kiran N via aajisaka) + Release 2.7.1 - 2015-07-06 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 6fa81eb2f8a..fdde7351067 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md @@ -368,9 +368,18 @@ Returns 0 on success and non-zero on error. getmerge -------- -Usage: `hadoop fs -getmerge [addnl]` +Usage: `hadoop fs -getmerge [-nl] ` -Takes a source directory and a destination file as input and concatenates files in src into the destination local file. Optionally addnl can be set to enable adding a newline character at the end of each file. +Takes a source directory and a destination file as input and concatenates files in src into the destination local file. Optionally -nl can be set to enable adding a newline character (LF) at the end of each file. + +Examples: + +* `hadoop fs -getmerge -nl /src /opt/output.txt` +* `hadoop fs -getmerge -nl /src/file1.txt /src/file2.txt /output.txt` + +Exit Code: + +Returns 0 on success and non-zero on error. help ----