Repository: hadoop Updated Branches: refs/heads/branch-2 a9a361c54 -> 9d8dbf8ea
YARN-3191. Log object should be initialized with its own class. Contributed by Rohith. (cherry picked from commit 99c7f2b8fa417303e8f42ea3641c302135879280) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9d8dbf8e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9d8dbf8e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9d8dbf8e Branch: refs/heads/branch-2 Commit: 9d8dbf8ea437b329dea51e2443f9d3566e9faf83 Parents: a9a361c Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Feb 12 17:56:59 2015 -0800 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Thu Feb 12 17:59:04 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../nodemanager/containermanager/application/ApplicationImpl.java | 2 +- .../nodemanager/containermanager/container/ContainerImpl.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d8dbf8e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5fb3ae1..4af219b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -546,6 +546,9 @@ Release 2.7.0 - UNRELEASED YARN-3104. Fixed RM to not generate new AMRM tokens on every heartbeat between rolling and activation. (Jason Lowe via jianhe) + YARN-3191. Log object should be initialized with its own class. (Rohith via + aajisaka) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d8dbf8e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java index fbcd4a1..a73b113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java @@ -73,7 +73,7 @@ public class ApplicationImpl implements Application { private final WriteLock writeLock; private final Context context; - private static final Log LOG = LogFactory.getLog(Application.class); + private static final Log LOG = LogFactory.getLog(ApplicationImpl.class); private LogAggregationContext logAggregationContext; http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d8dbf8e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java index 57b0bda..cf3d8e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java @@ -99,7 +99,7 @@ public class ContainerImpl implements Container { /** The NM-wide configuration - not specific to this container */ private final Configuration daemonConf; - private static final Log LOG = LogFactory.getLog(Container.class); + private static final Log LOG = LogFactory.getLog(ContainerImpl.class); private final Map<LocalResourceRequest,List<String>> pendingResources = new HashMap<LocalResourceRequest,List<String>>(); private final Map<Path,List<String>> localizedResources =
