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 om...@apache.org on 2011/06/16 23:41:57 UTC
svn commit: r1136693 - in /hadoop/common/branches/branch-0.20-security-204:
CHANGES.txt src/test/org/apache/hadoop/mapred/MRCaching.java
Author: omalley
Date: Thu Jun 16 21:41:57 2011
New Revision: 1136693
URL: http://svn.apache.org/viewvc?rev=1136693&view=rev
Log:
HADOOP-7364. TestMiniMRDFSCaching fails if test.build.dir is set to
something other than build/test. (Thomas Graves via mahadev)
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/MRCaching.java
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1136693&r1=1136692&r2=1136693&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 16 21:41:57 2011
@@ -1,9 +1,5 @@
Hadoop Change Log
-Release 0.20.205.0 - unreleased
-
- BUG FIXES
-
Release 0.20.204.0 - unreleased
NEW FEATURES
@@ -15,6 +11,9 @@ Release 0.20.204.0 - unreleased
BUG FIXES
+ HADOOP-7364. TestMiniMRDFSCaching fails if test.build.dir is set to
+ something other than build/test. (Thomas Graves via mahadev)
+
HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from
trying to use the wrong bin directory. (omalley)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 21:41:57 2011
@@ -1,6 +1,7 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1134140
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
+/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1133282
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/MRCaching.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/MRCaching.java?rev=1136693&r1=1136692&r2=1136693&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/MRCaching.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/MRCaching.java Thu Jun 16 21:41:57 2011
@@ -189,7 +189,8 @@ public class MRCaching {
static void setupCache(String cacheDir, FileSystem fs)
throws IOException {
- Path localPath = new Path("build/test/cache");
+ Path localPath = new Path(System.getProperty("test.cache.data", "build/test/cache"));
+
Path txtPath = new Path(localPath, new Path("test.txt"));
Path jarPath = new Path(localPath, new Path("test.jar"));
Path zipPath = new Path(localPath, new Path("test.zip"));