From 7bec80179b207ff92c94b59ef9ce9669c3742d37 Mon Sep 17 00:00:00 2001 From: Jason Darrell Lowe Date: Wed, 26 Dec 2012 20:49:39 +0000 Subject: [PATCH] svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 09d14995859..dc99cc10771 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -491,6 +491,9 @@ Release 0.23.6 - UNRELEASED MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while speculating (jlowe) + MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output + (Albert Chu via jlowe) + Release 0.23.5 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java index ef8a2a95256..f2cbc6e4ed7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java @@ -282,7 +282,7 @@ class Fetcher extends Thread { LOG.debug("url="+msgToEncode+";encHash="+encHash+";replyHash="+replyHash); // verify that replyHash is HMac of encHash SecureShuffleUtils.verifyReply(replyHash, encHash, jobTokenSecret); - LOG.info("for url="+msgToEncode+" sent hash and receievd reply"); + LOG.info("for url="+msgToEncode+" sent hash and received reply"); } catch (IOException ie) { boolean connectExcpt = ie instanceof ConnectException; ioErrs.increment(1);