accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1397192 - in /accumulo/trunk: ./ core/ core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java fate/src/main/java/org/apache/accumulo/fate/ZooStore.java server/ src/
Date Thu, 11 Oct 2012 17:41:33 GMT
Author: ecn
Date: Thu Oct 11 17:41:33 2012
New Revision: 1397192

URL: http://svn.apache.org/viewvc?rev=1397192&view=rev
Log:
ACCUMULO-805

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1397189
  Merged /accumulo/branches/1.4:r1397189

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/core:r1397189
  Merged /accumulo/branches/1.4/src/core:r1397189

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java?rev=1397192&r1=1397191&r2=1397192&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
(original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
Thu Oct 11 17:41:33 2012
@@ -139,6 +139,7 @@ public class MockTableOperationsTest {
     fs.deleteOnExit(tempFile);
     fs.deleteOnExit(failures);
     fs.delete(failures, true);
+    fs.delete(tempFile, true);
     fs.mkdirs(failures);
     fs.mkdirs(tempFile.getParent());
     FileSKVWriter writer = FileOperations.getInstance().openWriter(

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1397189
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1397189

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1397189
  Merged /accumulo/branches/1.4/src/server:r1397189

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1397189
  Merged /accumulo/branches/1.4/src/src:r1397189



Mime
View raw message