Merge -r 1172846:1172847 from trunk to branch-0.23 to fix MAPREDUCE-3042.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -1322,6 +1322,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3030. Fixed a bug in NodeId.equals() that was causing RM to
     reject all NMs. (Devaraj K via vinodkv)
 
+    MAPREDUCE-3042. Fixed default ResourceTracker address. (Chris Riccomini
+    via acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java

@@ -97,7 +97,7 @@ public class ResourceTrackerService extends AbstractService implements
   public synchronized void init(Configuration conf) {
     String resourceTrackerBindAddress =
       conf.get(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
-          YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS);
+          YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS);
     resourceTrackerAddress = NetUtils.createSocketAddr(resourceTrackerBindAddress);
 
     RackResolver.init(conf);