You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2012/01/05 21:12:09 UTC
svn commit: r1227810 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml
Author: acmurthy
Date: Thu Jan 5 20:12:09 2012
New Revision: 1227810
URL: http://svn.apache.org/viewvc?rev=1227810&view=rev
Log:
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.
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1227810&r1=1227809&r2=1227810&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu Jan 5 20:12:09 2012
@@ -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
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml?rev=1227810&r1=1227809&r2=1227810&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml Thu Jan 5 20:12:09 2012
@@ -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>