Author: cnauroth
Date: Fri Aug 16 22:37:24 2013
New Revision: 1514914
URL: http://svn.apache.org/r1514914
Log:
HDFS-5106. Merging change r1514911 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1514914&r1=1514913&r2=1514914&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Aug 16 22:37:24 2013
@@ -129,6 +129,9 @@ Release 2.1.1-beta - UNRELEASED
HDFS-5105. TestFsck fails on Windows. (Chuan Liu via arp)
+ HDFS-5106. TestDatanodeBlockScanner fails on Windows due to incorrect path
+ format. (Chuan Liu via cnauroth)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java?rev=1514914&r1=1514913&r2=1514914&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
Fri Aug 16 22:37:24 2013
@@ -440,7 +440,8 @@ public class TestDatanodeBlockScanner {
}
}
- private static final String BASE_PATH = "/data/current/finalized";
+ private static final String BASE_PATH = (new File("/data/current/finalized"))
+ .getAbsolutePath();
@Test
public void testReplicaInfoParsing() throws Exception {
