Merge -c 1227808 from trunk to branch-0.23 to fix MAPREDUCE-3617.emoved wrong default value for yarn.resourcemanager.principal and yarn.nodemanager.principal.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -366,6 +366,10 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3548. Added more unit tests for MR AM & JHS web-services.
     (Thomas Graves via acmurthy) 
 
+    MAPREDUCE-3617. Removed wrong default value for
+    yarn.resourcemanager.principal and yarn.nodemanager.principal. (Jonathan
+    Eagles via acmurthy) 
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml

@@ -79,7 +79,6 @@
   <property>
     <description>The Kerberos principal for the resource manager.</description>
     <name>yarn.resourcemanager.principal</name>
-    <value>rm/sightbusy-lx@LOCALHOST</value>
   </property>
 
   <property>
@@ -430,7 +429,7 @@
   <property>
     <description>The kerberos principal for the node manager.</description>
     <name>yarn.nodemanager.principal</name>
-    <value>nm/sightbusy-lx@LOCALHOST</value>
+    <value></value>
   </property>
 
   <property>