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 2056B17D56 for ; Wed, 22 Apr 2015 22:34:25 +0000 (UTC) Received: (qmail 70402 invoked by uid 500); 22 Apr 2015 22:34:25 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 70296 invoked by uid 500); 22 Apr 2015 22:34:25 -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 70212 invoked by uid 99); 22 Apr 2015 22:34:25 -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; Wed, 22 Apr 2015 22:34:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D712AE03EB; Wed, 22 Apr 2015 22:34:24 +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: Wed, 22 Apr 2015 22:34:27 -0000 Message-Id: <7e6205f7a49e4ae6af7ccc9c9aabccd7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58cfee84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58cfee84 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58cfee84 Branch: refs/heads/master Commit: 58cfee84d1d052e0f48afc840996b24eb5f89516 Parents: 9abf6a3 312b876 Author: Keith Turner Authored: Wed Apr 22 18:25:02 2015 -0400 Committer: Keith Turner Committed: Wed Apr 22 18:25:02 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 29 +++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) ----------------------------------------------------------------------