Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7E164200B9E for ; Sat, 8 Oct 2016 22:46:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7CB7B160AF3; Sat, 8 Oct 2016 20:46:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B8B46160ADF for ; Sat, 8 Oct 2016 22:46:51 +0200 (CEST) Received: (qmail 31147 invoked by uid 500); 8 Oct 2016 20:46:50 -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 31063 invoked by uid 99); 8 Oct 2016 20:46:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Oct 2016 20:46:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB546E04BE; Sat, 8 Oct 2016 20:46:50 +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: Sat, 08 Oct 2016 20:46:52 -0000 Message-Id: In-Reply-To: <3aded0ff5a2143c8b7f3cbb9691af8d7@git.apache.org> References: <3aded0ff5a2143c8b7f3cbb9691af8d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.8' archived-at: Sat, 08 Oct 2016 20:46:52 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f206bef2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f206bef2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f206bef2 Branch: refs/heads/master Commit: f206bef2110346379280d6578e4e134c229ee44d Parents: c57a380 d2a3f7f Author: Josh Elser Authored: Sat Oct 8 16:46:38 2016 -0400 Committer: Josh Elser Committed: Sat Oct 8 16:46:38 2016 -0400 ---------------------------------------------------------------------- .../iteratortest/IteratorTestInput.java | 70 ++++++++++++++++++-- .../iteratortest/IteratorTestRunner.java | 2 +- .../testcases/DeepCopyTestCase.java | 4 +- .../testcases/IsolatedDeepCopiesTestCase.java | 11 +-- .../testcases/MultipleHasTopCalls.java | 4 +- .../iteratortest/testcases/ReSeekTestCase.java | 10 +-- 6 files changed, 78 insertions(+), 23 deletions(-) ----------------------------------------------------------------------