From f614cb71d47a34a5e7ccb1057f4f61d3cd179f55 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Thu, 25 Sep 2014 11:27:19 -0700 Subject: [PATCH] MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 5176304aed..1ac32aa689 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -372,6 +372,9 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2 (Mit Desai via jlowe) + MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb + via aw) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java index 9b85997ef9..d263f8273d 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java @@ -54,7 +54,7 @@ public enum DistCpOptionSwitch { "and timestamps. " + "raw.* xattrs are preserved when both the source and destination " + "paths are in the /.reserved/raw hierarchy (HDFS only). raw.* xattr" + - "preservation is independent of the -p flag." + + "preservation is independent of the -p flag. " + "Refer to the DistCp documentation for more details.")), /**