hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deva...@apache.org
Subject hadoop git commit: YARN-3794. TestRMEmbeddedElector fails because of ambiguous LOG reference. Contributed by Chengbing Liu.
Date Fri, 12 Jun 2015 08:15:57 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 83e8110f8 -> d8dcfa98e


YARN-3794. TestRMEmbeddedElector fails because of ambiguous LOG reference.
Contributed by Chengbing Liu.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d8dcfa98
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d8dcfa98
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d8dcfa98

Branch: refs/heads/trunk
Commit: d8dcfa98e3ca6a6fea414fd503589bb83b7a9c51
Parents: 83e8110
Author: Devaraj K <devaraj@apache.org>
Authored: Fri Jun 12 13:42:49 2015 +0530
Committer: Devaraj K <devaraj@apache.org>
Committed: Fri Jun 12 13:42:49 2015 +0530

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                  | 3 +++
 .../yarn/server/resourcemanager/TestRMEmbeddedElector.java       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8dcfa98/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index dc43ad8..f5780c9 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -521,6 +521,9 @@ Release 2.8.0 - UNRELEASED
 
     YARN-3778. Fix Yarn resourcemanger CLI usage. (Brahma Reddy Battula via xgong)
 
+    YARN-3794. TestRMEmbeddedElector fails because of ambiguous LOG reference.
+    (Chengbing Liu via devaraj)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8dcfa98/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
index 1b0bf7e..20b1c0e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
@@ -102,9 +102,9 @@ public class TestRMEmbeddedElector extends ClientBaseWithFixes {
                 ServiceFailedException {
               try {
                 callbackCalled.set(true);
-                LOG.info("Callback called. Sleeping now");
+                TestRMEmbeddedElector.LOG.info("Callback called. Sleeping now");
                 Thread.sleep(delayMs);
-                LOG.info("Sleep done");
+                TestRMEmbeddedElector.LOG.info("Sleep done");
               } catch (InterruptedException e) {
                 e.printStackTrace();
               }


Mime
View raw message