Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EDE1917D92 for ; Tue, 30 Sep 2014 00:47:06 +0000 (UTC) Received: (qmail 19322 invoked by uid 500); 30 Sep 2014 00:47:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19225 invoked by uid 500); 30 Sep 2014 00:47:06 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 19051 invoked by uid 99); 30 Sep 2014 00:47:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2014 00:47:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 61559A02D76; Tue, 30 Sep 2014 00:47:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 30 Sep 2014 00:47:13 -0000 Message-Id: <2714d9ae859e4458a5531a8685a1f0ad@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/9] git commit: Merge branch '1.5' into 1.6 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 Authored: Mon Sep 29 19:44:49 2014 -0400 Committer: Josh Elser 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)); }