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 12D0E18A35 for ; Fri, 24 Apr 2015 23:50:08 +0000 (UTC) Received: (qmail 86178 invoked by uid 500); 24 Apr 2015 23:50:08 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 86081 invoked by uid 500); 24 Apr 2015 23:50:08 -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 86060 invoked by uid 99); 24 Apr 2015 23:50:07 -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:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1F5BE0F7D; Fri, 24 Apr 2015 23:50:07 +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:08 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: Merge branch '1.5' into 1.6 Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bcbab7d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bcbab7d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bcbab7d Branch: refs/heads/1.7 Commit: 0bcbab7d6ab8bd0523b630bda1a1ff254e68f1cf Parents: dd9cc1c 5ac1b52 Author: Keith Turner Authored: Fri Apr 24 19:39:04 2015 -0400 Committer: Keith Turner Committed: Fri Apr 24 19:39:04 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 58 +++++++++++--------- 1 file changed, 33 insertions(+), 25 deletions(-) ----------------------------------------------------------------------