Repository: hadoop Updated Branches: refs/heads/branch-2 577ea0886 -> 24b60a7d1
HADOOP-11760. Fix typo of javadoc in DistCp. Contributed by Brahma Reddy Battula. (cherry picked from commit e074952bd6bedf58d993bbea690bad08c9a0e6aa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/24b60a7d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/24b60a7d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/24b60a7d Branch: refs/heads/branch-2 Commit: 24b60a7d1ab5b516902a860e65099fdb2d59d019 Parents: 577ea08 Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Fri Mar 27 23:15:51 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Fri Mar 27 23:16:37 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/tools/DistCp.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/24b60a7d/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 4a7dbf2..63e053b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -49,6 +49,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11724. DistCp throws NPE when the target directory is root. (Lei Eddy Xu via Yongjun Zhang) + HADOOP-11760. Fix typo of javadoc in DistCp. (Brahma Reddy Battula via + ozawa). + Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/24b60a7d/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java index ada4b25..6921a1e 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java @@ -401,7 +401,7 @@ public class DistCp extends Configured implements Tool { * job staging directory * * @return Returns the working folder information - * @throws Exception - EXception if any + * @throws Exception - Exception if any */ private Path createMetaFolderPath() throws Exception { Configuration configuration = getConf();