accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Thu, 11 Sep 2014 23:09:45 GMT
Merge branch '1.6.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/abf966e1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/abf966e1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/abf966e1

Branch: refs/heads/master
Commit: abf966e19649d75c9774aa8d0bf6fcb4cd545005
Parents: c196a26 0d76cd5
Author: Billie Rinaldi <billie@apache.org>
Authored: Thu Sep 11 16:08:39 2014 -0700
Committer: Billie Rinaldi <billie@apache.org>
Committed: Thu Sep 11 16:08:39 2014 -0700

----------------------------------------------------------------------
 .../accumulo/test/ConditionalWriterIT.java      | 41 +++++++++++---------
 .../org/apache/accumulo/test/MetaSplitIT.java   | 28 +++++++++----
 2 files changed, 44 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/abf966e1/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 6951884,477f492..3bf9284
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@@ -1199,9 -1204,10 +1204,9 @@@ public class ConditionalWriterIT extend
      cw.write(cm1);
    }
    
-   @Test(timeout = 60 * 1000)
+   @Test
    public void testTrace() throws Exception {
  
 -    Process tracer = null;
      Connector conn = getConnector();
      if (!conn.tableOperations().exists("trace")) {
        getStaticCluster().exec(TraceServer.class);


Mime
View raw message