accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1478512 - in /accumulo/trunk: ./ assemble/ core/ core/src/test/java/org/apache/accumulo/core/util/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/test/jav...
Date Thu, 02 May 2013 20:17:41 GMT
Author: ecn
Date: Thu May  2 20:17:40 2013
New Revision: 1478512

URL: http://svn.apache.org/r1478512
Log:
ACCUMULO-1334 merging 1.5 to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1477423-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478122,1478124-1478153,1478155-1478482,1478484-1478496

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1477423-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478153,1478155-1478482,1478484-1478496

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1477414-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478122,1478124-1478153,1478155-1478482,1478484-1478496

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java?rev=1478512&r1=1478511&r2=1478512&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java Thu May
 2 20:17:40 2013
@@ -20,7 +20,6 @@ import static org.apache.accumulo.core.u
 import static org.apache.accumulo.core.util.NumUtil.bigNumberForSize;
 import static org.junit.Assert.assertEquals;
 
-import org.apache.accumulo.core.util.NumUtil;
 import org.junit.Test;
 
 public class NumUtilTest {

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1477414-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478153,1478155-1478482,1478484-1478496

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1477414-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478153,1478155-1478482,1478484-1478496

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1477414-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478153,1478155-1478482,1478484-1478496

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1477414-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478153,1478155-1478482,1478484-1478496

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1477414-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478153,1478155-1478482,1478484-1478496

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1477414-1477731,1477733-1477781,1477783-1477789,1477791-1478004,1478006-1478008,1478010-1478153,1478155-1478482,1478484-1478496

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1478512&r1=1478511&r2=1478512&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Thu May
 2 20:17:40 2013
@@ -113,10 +113,10 @@ public class ShellServerTest {
     Shell.log.debug(output.get());
     assertEquals(0, shell.getExitCode());
 
-  if (s.length() > 0)
-  assertEquals(s + " present in " + output.get() + " was not " + stringPresent, stringPresent,
output.get().contains(s));
-}
-
+    if (s.length() > 0)
+      assertEquals(s + " present in " + output.get() + " was not " + stringPresent, stringPresent,
output.get().contains(s));
+  }
+  
   static void assertBadExit(String s, boolean stringPresent) {
     Shell.log.debug(output.get());
     assertTrue(shell.getExitCode() > 0);

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java?rev=1478512&r1=1478511&r2=1478512&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java Thu
May  2 20:17:40 2013
@@ -17,7 +17,6 @@
 package org.apache.accumulo.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;



Mime
View raw message