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/05/31 22:48:09 UTC
svn commit: r1129911 - in /hadoop/common/branches/yahoo-merge: CHANGES.txt
src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java
Author: jitendra
Date: Tue May 31 20:48:09 2011
New Revision: 1129911
URL: http://svn.apache.org/viewvc?rev=1129911&view=rev
Log:
Merged r1129905 for HADOOP-7336 from trunk
Modified:
hadoop/common/branches/yahoo-merge/CHANGES.txt (contents, props changed)
hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java
Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1129911&r1=1129910&r2=1129911&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Tue May 31 20:48:09 2011
@@ -115,6 +115,9 @@ Trunk (unreleased changes)
HADOOP-7282. ipc.Server.getRemoteIp() may return null. (John George
via szetszwo)
+ HADOOP-7336. TestFileContextResolveAfs will fail with default
+ test.build.data property. (jitendra)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/yahoo-merge/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 20:48:09 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1092832,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591
+/hadoop/common/trunk/CHANGES.txt:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1092832,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591,1129905
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java?rev=1129911&r1=1129910&r2=1129911&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java Tue May 31 20:48:09 2011
@@ -33,7 +33,7 @@ import org.junit.Test;
public class TestFileContextResolveAfs {
private static String TEST_ROOT_DIR_LOCAL
- = System.getProperty("test.build.data","build/test/data/work-dir/localfs");
+ = System.getProperty("test.build.data","/tmp");
private FileContext fc;
private FileSystem localFs;
@@ -48,8 +48,8 @@ public class TestFileContextResolveAfs {
Configuration conf = new Configuration();
localFs = FileSystem.get(conf);
- Path localPath = new Path(TEST_ROOT_DIR_LOCAL + "/file1");
- Path linkPath = new Path("file:///" + TEST_ROOT_DIR_LOCAL + "/file2");
+ Path localPath = new Path(TEST_ROOT_DIR_LOCAL + "/TestFileContextResolveAfs1");
+ Path linkPath = new Path("file://" + TEST_ROOT_DIR_LOCAL + "/TestFileContextResolveAfs2");
localFs.mkdirs(new Path(TEST_ROOT_DIR_LOCAL));
localFs.create(localPath);