svn commit: r1341973 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java

[tgraves]

Author: tgraves
Date: Wed May 23 18:38:23 2012
New Revision: 1341973

URL: http://svn.apache.org/viewvc?rev=1341973&view=rev
Log:
merge -r 1341971:1341972 from trunk. FIXES: MAPREDUCE-4262

Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1341973&r1=1341972&r2=1341973&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
May 23 18:38:23 2012
@@ -24,6 +24,9 @@ Release 2.0.1-alpha - UNRELEASED
     MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta.
     (todd via bobby)
 
+    MAPREDUCE-4262. NM gives wrong log message saying "Connected to 
+    ResourceManager" before trying to connect. (Devaraj K via tgraves)
+
 Release 2.0.0-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java?rev=1341973&r1=1341972&r2=1341973&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java
 Wed May 23 18:38:23 2012
@@ -181,7 +181,7 @@ public class NodeStatusUpdaterImpl exten
 
   private void registerWithRM() throws YarnRemoteException {
     this.resourceTracker = getRMClient();
-    LOG.info("Connected to ResourceManager at " + this.rmAddress);
+    LOG.info("Connecting to ResourceManager at " + this.rmAddress);
     
     RegisterNodeManagerRequest request = 
recordFactory.newRecordInstance(RegisterNodeManagerRequest.class);
     request.setHttpPort(this.httpPort);