Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Arun Murthy 2012-01-05 20:12:09 +00:00
parent e3e457398e
commit 93dce45243
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-mapreduce-project/CHANGES.txt
View File

@ -366,6 +366,10 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3548. Added more unit tests for MR AM & JHS web-services. MAPREDUCE-3548. Added more unit tests for MR AM & JHS web-services.
(Thomas Graves via acmurthy) (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 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

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