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

HDFS-8948. Merging change 1400324 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400327 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2012-10-19 22:55:20 +00:00
parent aafad662be
commit 65a52c8e7c
2 changed files with 7 additions and 2 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

@ -107,6 +107,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8900. BuiltInGzipDecompressor throws IOException - stored gzip size HADOOP-8900. BuiltInGzipDecompressor throws IOException - stored gzip size
doesn't match decompressed size. (Slavik Krassovsky via suresh) doesn't match decompressed size. (Slavik Krassovsky via suresh)
HADOOP-8948. TestFileUtil.testGetDU fails on Windows due to incorrect
assumption of line separator. (Chris Nauroth via suresh)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
View File

@ -472,7 +472,9 @@ public class TestFileUtil {
setupDirs(); setupDirs();
long du = FileUtil.getDU(TEST_DIR); long du = FileUtil.getDU(TEST_DIR);
//Only two files (in partitioned) have 4 bytes each // Only two files (in partitioned). Each has 3 characters + system-specific
Assert.assertEquals(du, 8); // line separator.
long expected = 2 * (3 + System.getProperty("line.separator").length());
Assert.assertEquals(expected, du);
} }
} }