[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hadoop-commits
Subject:    svn commit: r1332364 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./
From:       szetszwo () apache ! org
Date:       2012-04-30 20:13:35
Message-ID: 20120430201335.4BC712388865 () eris ! apache ! org
[Download RAW message or body]

Author: szetszwo
Date: Mon Apr 30 20:13:34 2012
New Revision: 1332364

URL: http://svn.apache.org/viewvc?rev=1332364&view=rev
Log:
svn merge -c 1332363 from trunk for HADOOP-8330.

Modified:
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/   (props \
changed)  hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt \
(contents, props changed)  \
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java


Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1332363

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
                
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1332364&r1=1332363&r2=1332364&view=diff
 ==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt \
                (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt \
Mon Apr 30 20:13:34 2012 @@ -368,6 +368,9 @@ Release 0.23.3 - UNRELEASED
     HADOOP-8334. HttpServer sometimes returns incorrect port (Daryn Sharp via
     bobby)
 
+    HADOOP-8330. Update TestSequenceFile.testCreateUsesFsArg() for HADOOP-8305.
+    (John George via szetszwo)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
                
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1332363


Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
                
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-projec \
t/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java?rev=1332364&r1=1332363&r2=1332364&view=diff
 ==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java \
                (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java \
Mon Apr 30 20:13:34 2012 @@ -470,7 +470,7 @@ public class TestSequenceFile extends Te
     SequenceFile.Writer writer = SequenceFile.createWriter(
         spyFs, conf, p, NullWritable.class, NullWritable.class);
     writer.close();
-    Mockito.verify(spyFs).getDefaultReplication();
+    Mockito.verify(spyFs).getDefaultReplication(p);
   }
 
   private static class TestFSDataInputStream extends FSDataInputStream {


[prev in list] [next in list] [prev in thread] [next in thread]