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

Merge -r 1173837:1173838 from trunk to branch-0.23 to fix MAPREDUCE-3062. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173839 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-09-21 20:37:42 +00:00
parent 01da4430d2
commit 695a8c75f7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1358,6 +1358,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-2970. Fixed NPEs in corner cases with different configurations MAPREDUCE-2970. Fixed NPEs in corner cases with different configurations
for mapreduce.framework.name. (Venu Gopala Rao via vinodkv) for mapreduce.framework.name. (Venu Gopala Rao via vinodkv)
MAPREDUCE-3062. Fixed default RMAdmin address. (Chris Riccomini
via acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
View File

@ -84,7 +84,7 @@ public class AdminService extends AbstractService implements RMAdminProtocol {
super.init(conf); super.init(conf);
String bindAddress = String bindAddress =
conf.get(YarnConfiguration.RM_ADMIN_ADDRESS, conf.get(YarnConfiguration.RM_ADMIN_ADDRESS,
YarnConfiguration.RM_ADMIN_ADDRESS); YarnConfiguration.DEFAULT_RM_ADMIN_ADDRESS);
masterServiceAddress = NetUtils.createSocketAddr(bindAddress); masterServiceAddress = NetUtils.createSocketAddr(bindAddress);
adminAcl = adminAcl =
new AccessControlList( new AccessControlList(