merge -r 1341971:1341972 from trunk. FIXES: MAPREDUCE-4262

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341973 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -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

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java

@@ -181,7 +181,7 @@ public class NodeStatusUpdaterImpl extends AbstractService implements
 
   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);