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

svn merge -c 1332363 from trunk for HADOOP-8330. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332364 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-04-30 20:13:34 +00:00
parent f49684246e
commit 0af11f7bff
2 changed files with 4 additions and 1 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

@ -368,6 +368,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8334. HttpServer sometimes returns incorrect port (Daryn Sharp via HADOOP-8334. HttpServer sometimes returns incorrect port (Daryn Sharp via
bobby) bobby)
HADOOP-8330. Update TestSequenceFile.testCreateUsesFsArg() for HADOOP-8305.
(John George via szetszwo)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
NEW FEATURES NEW FEATURES

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
View File

@ -470,7 +470,7 @@ public class TestSequenceFile extends TestCase {
SequenceFile.Writer writer = SequenceFile.createWriter( SequenceFile.Writer writer = SequenceFile.createWriter(
spyFs, conf, p, NullWritable.class, NullWritable.class); spyFs, conf, p, NullWritable.class, NullWritable.class);
writer.close(); writer.close();
Mockito.verify(spyFs).getDefaultReplication(); Mockito.verify(spyFs).getDefaultReplication(p);
} }
private static class TestFSDataInputStream extends FSDataInputStream { private static class TestFSDataInputStream extends FSDataInputStream {