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 E3D58112DC for ; Wed, 21 May 2014 04:29:12 +0000 (UTC) Received: (qmail 91241 invoked by uid 500); 21 May 2014 04:29:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 91126 invoked by uid 500); 21 May 2014 04:29:12 -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 91048 invoked by uid 99); 21 May 2014 04:29:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 04:29:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E63899AD4B; Wed, 21 May 2014 04:29:12 +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: Wed, 21 May 2014 04:29:17 -0000 Message-Id: <2be2e251640f47ddbb6dece01301f301@git.apache.org> In-Reply-To: <5d630bc04603446d8e469d65791e2fc2@git.apache.org> References: <5d630bc04603446d8e469d65791e2fc2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/8] git commit: Merge branch 'ACCUMULO-2825' into 1.6.1-SNAPSHOT Merge branch 'ACCUMULO-2825' into 1.6.1-SNAPSHOT Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1193f4b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1193f4b8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1193f4b8 Branch: refs/heads/ACCUMULO-378 Commit: 1193f4b84b1ede802b5ac636e802efb3052b7fa0 Parents: 244c1ab b7ccde3 Author: Josh Elser Authored: Tue May 20 22:53:56 2014 -0400 Committer: Josh Elser Committed: Tue May 20 22:53:56 2014 -0400 ---------------------------------------------------------------------- .../iterators/user/RowEncodingIterator.java | 174 +++++++++++++++++++ .../core/iterators/user/WholeRowIterator.java | 140 +++------------ 2 files changed, 199 insertions(+), 115 deletions(-) ----------------------------------------------------------------------