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

HADOOP-10500. Merging change r1587361 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587362 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-04-14 23:52:21 +00:00
parent f3039d3640
commit d2bb90033e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10496. Metrics system FileSink can leak file descriptor. (cnauroth)
HADOOP-10500. TestDoAsEffectiveUser fails on JDK7 due to failure to reset
proxy user configuration. (cnauroth)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

7
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java
View File

@ -74,8 +74,9 @@ public class TestDoAsEffectiveUser {
}
@Before
public void setMasterConf() {
public void setMasterConf() throws IOException {
UserGroupInformation.setConfiguration(masterConf);
refreshConf(masterConf);
}
private void configureSuperUserIPAddresses(Configuration conf,
@ -297,6 +298,8 @@ public class TestDoAsEffectiveUser {
.setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0)
.setNumHandlers(2).setVerbose(false).build();
refreshConf(conf);
try {
server.start();
@ -379,6 +382,8 @@ public class TestDoAsEffectiveUser {
.setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0)
.setNumHandlers(2).setVerbose(false).build();
refreshConf(conf);
try {
server.start();