Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12359. hadoop fs -getmerge doc is wrong. Contributed by Jagadesh Kiran N. 

(cherry picked from commit 2e251a7674)
(cherry picked from commit 236c4ab511)
This commit is contained in:
Akira Ajisaka 2015-09-01 20:55:33 +09:00
parent 1b5bf58001
commit bcb98ba081
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -32,6 +32,9 @@ Release 2.7.2 - UNRELEASED
HADOOP-12061. Incorrect command in single cluster setup document. HADOOP-12061. Incorrect command in single cluster setup document.
(Kengo Seki via aajisaka) (Kengo Seki via aajisaka)
HADOOP-12359. hadoop fs -getmerge doc is wrong.
(Jagadesh Kiran N via aajisaka)
Release 2.7.1 - 2015-07-06 Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

13
hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
View File

@ -368,9 +368,18 @@ Returns 0 on success and non-zero on error.
getmerge getmerge
-------- --------
Usage: `hadoop fs -getmerge <src> <localdst> [addnl]` Usage: `hadoop fs -getmerge [-nl] <src> <localdst>`
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 help
---- ----