Repository: hadoop Updated Branches: refs/heads/branch-2 7f39cab35 -> 25f4a0193
MAPREDUCE-6046. Change the class name for logs in RMCommunicator. Contributed by Sahil Takiar. (cherry picked from commit 0bd022911013629a8c9e7357fae8cf4399d7a1e3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/25f4a019 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/25f4a019 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/25f4a019 Branch: refs/heads/branch-2 Commit: 25f4a0193b5ce30520c6558e830b2cbec89e9ff3 Parents: 7f39cab Author: Devaraj K <[email protected]> Authored: Fri Dec 12 11:42:03 2014 +0530 Committer: Devaraj K <[email protected]> Committed: Fri Dec 12 11:44:00 2014 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/25f4a019/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index eaa37a1..858ac05 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -14,6 +14,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log (Gera Shegalov via jlowe) + MAPREDUCE-6046. Change the class name for logs in RMCommunicator + (Sahil Takiar via devaraj) + OPTIMIZATIONS MAPREDUCE-6169. MergeQueue should release reference to the current item http://git-wip-us.apache.org/repos/asf/hadoop/blob/25f4a019/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java index cd4e272..5d4fa12 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java @@ -67,7 +67,7 @@ import org.apache.hadoop.yarn.proto.YarnServiceProtos.SchedulerResourceTypes; */ public abstract class RMCommunicator extends AbstractService implements RMHeartbeatHandler { - private static final Log LOG = LogFactory.getLog(RMContainerAllocator.class); + private static final Log LOG = LogFactory.getLog(RMCommunicator.class); private int rmPollInterval;//millis protected ApplicationId applicationId; private final AtomicBoolean stopped;
