Merge -r 1173903:1173904 from trunk to branch-0.23 to fix MAPREDUCE-3066.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -1361,6 +1361,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3062. Fixed default RMAdmin address. (Chris Riccomini
     via acmurthy) 
 
+    MAPREDUCE-3066. Fixed default ResourceTracker address for the NodeManager. 
+    (Chris Riccomini via acmurthy) 
+
 Release 0.22.0 - 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

@@ -101,7 +101,7 @@ public class NodeStatusUpdaterImpl extends AbstractService implements
   public synchronized void init(Configuration conf) {
     this.rmAddress =
         conf.get(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
-            YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS);
+            YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS);
     this.heartBeatInterval =
         conf.getLong(YarnConfiguration.NM_TO_RM_HEARTBEAT_INTERVAL_MS,
             YarnConfiguration.DEFAULT_NM_TO_RM_HEARTBEAT_INTERVAL_MS);