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 B49A318A39 for ; Fri, 24 Apr 2015 23:50:16 +0000 (UTC) Received: (qmail 89652 invoked by uid 500); 24 Apr 2015 23:50:16 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 89539 invoked by uid 500); 24 Apr 2015 23:50:16 -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 89459 invoked by uid 99); 24 Apr 2015 23:50:16 -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; Fri, 24 Apr 2015 23:50:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 77EC1E1090; Fri, 24 Apr 2015 23:50:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Fri, 24 Apr 2015 23:50:18 -0000 Message-Id: In-Reply-To: <52096fedb4284d82839f8f4d0bf20a5b@git.apache.org> References: <52096fedb4284d82839f8f4d0bf20a5b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] accumulo git commit: Merge branch '1.6' into 1.7 Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18650ac6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18650ac6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18650ac6 Branch: refs/heads/master Commit: 18650ac66d575659660efe33e8a505bf45765cfd Parents: 55981ad 0bcbab7 Author: Keith Turner Authored: Fri Apr 24 19:39:32 2015 -0400 Committer: Keith Turner Committed: Fri Apr 24 19:39:32 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 58 +++++++++++--------- 1 file changed, 33 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18650ac6/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java ----------------------------------------------------------------------