You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2011/09/22 21:18:58 UTC
svn commit: r1174328 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt
src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java
src/test/org/apache/hadoop/security/TestRefreshUserMappings.java
Author: jitendra
Date: Thu Sep 22 19:18:58 2011
New Revision: 1174328
URL: http://svn.apache.org/viewvc?rev=1174328&view=rev
Log:
Merged r1174326 from branch-0.20-security for HADOOP-7649.
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java
hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1174328&r1=1174327&r2=1174328&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Thu Sep 22 19:18:58 2011
@@ -169,6 +169,9 @@ Release 0.20.205.0 - 2011.09.12
HADOOP-7661. FileSystem.getCanonicalServiceName throws NPE for any
file system uri that doesn't have an authority. (jitendra)
+ HADOOP-7649. TestMapredGroupMappingServiceRefresh and
+ TestRefreshUserMappings fail after HADOOP-7625. (jitendra)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 22 19:18:58 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192,1173843
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192,1173843,1174326
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java?rev=1174328&r1=1174327&r2=1174328&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java Thu Sep 22 19:18:58 2011
@@ -246,9 +246,8 @@ public class TestMapredGroupMappingServi
private void addNewConfigResource(String rsrcName, String keyGroup,
String groups, String keyHosts, String hosts) throws FileNotFoundException {
// location for temp resource should be in CLASSPATH
- URL url = config.getResource("mapred-default.xml");
- Path p = new Path(url.getPath());
- Path dir = p.getParent();
+ String dir = System.getProperty("test.build.extraconf",
+ "build/test/extraconf");
tempResource = dir.toString() + "/" + rsrcName;
Modified: hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java?rev=1174328&r1=1174327&r2=1174328&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/TestRefreshUserMappings.java Thu Sep 22 19:18:58 2011
@@ -227,10 +227,8 @@ public class TestRefreshUserMappings {
private void addNewConfigResource(String rsrcName, String keyGroup,
String groups, String keyHosts, String hosts) throws FileNotFoundException {
// location for temp resource should be in CLASSPATH
- Configuration conf = new Configuration();
- URL url = conf.getResource("hdfs-default.xml");
- Path p = new Path(url.getPath());
- Path dir = p.getParent();
+ String dir = System.getProperty("test.build.extraconf",
+ "build/test/extraconf");
tempResource = dir.toString() + "/" + rsrcName;