accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [8/9] git commit: Merge branch '1.5' into 1.6
Date Tue, 30 Sep 2014 00:47:13 GMT
Merge branch '1.5' into 1.6

Conflicts:
	test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java


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

Branch: refs/heads/master
Commit: 6f029b0e9ef2d9d5aa886acb9c15d317081b4e08
Parents: 2ad4074 5459950
Author: Josh Elser <elserj@apache.org>
Authored: Mon Sep 29 19:44:49 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Sep 29 19:44:49 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/test/functional/SlowIterator.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f029b0e/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
index 03eaefb,a9b254e..cb29688
--- a/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
@@@ -34,14 -34,13 +34,14 @@@ public class SlowIterator extends Wrapp
  
    static private final String SLEEP_TIME = "sleepTime";
    static private final String SEEK_SLEEP_TIME = "seekSleepTime";
-   
++
    private long sleepTime = 0;
    private long seekSleepTime = 0;
 -
 +  
    public static void setSleepTime(IteratorSetting is, long millis) {
 -    is.addOption(SLEEP_TIME, Long.toString(millis));
 +    is.addOption(SLEEP_TIME, Long.toString(millis));  
    }
-   
+ 
    public static void setSeekSleepTime(IteratorSetting is, long t) {
      is.addOption(SEEK_SLEEP_TIME, Long.toString(t));
    }


Mime
View raw message