accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [3/3] git commit: ACCUMULO-2560 merge 1.6.1
Date Fri, 08 Aug 2014 18:25:59 GMT
ACCUMULO-2560 merge 1.6.1


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

Branch: refs/heads/master
Commit: 7f82a15f243eb103da88f45a37e32e8981d05842
Parents: 44fc2a6
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri Aug 8 12:04:07 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri Aug 8 12:04:07 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f82a15f/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
index e3d215f..30ac8ad 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
@@ -68,6 +68,7 @@ public class SimpleGarbageCollectorTest {
   private AccumuloConfiguration mockSystemConfig() {
     AccumuloConfiguration systemConfig = createMock(AccumuloConfiguration.class);
     expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_START)).andReturn(1000L);
+    expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_START)).andReturn(1000L);
     expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_DELAY)).andReturn(20000L);
     expect(systemConfig.getCount(Property.GC_DELETE_THREADS)).andReturn(2);
     expect(systemConfig.getCount(Property.GC_DELETE_THREADS)).andReturn(2);


Mime
View raw message