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 6899310F9B for ; Wed, 11 Sep 2013 02:42:06 +0000 (UTC) Received: (qmail 28592 invoked by uid 500); 11 Sep 2013 02:42:04 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 28450 invoked by uid 500); 11 Sep 2013 02:42:04 -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 28323 invoked by uid 99); 11 Sep 2013 02:42:01 -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, 11 Sep 2013 02:42:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 89E568BD461; Wed, 11 Sep 2013 02:42:01 +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, 11 Sep 2013 02:42:04 -0000 Message-Id: <93c9f9a9cb6e43c6b388f7ade3044e94@git.apache.org> In-Reply-To: <166a9a8c68ce442caa2edb2bcf8362f0@git.apache.org> References: <166a9a8c68ce442caa2edb2bcf8362f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: ACCUMULO-1639 Merge branch '1.5.1-SNAPSHOT' ACCUMULO-1639 Merge branch '1.5.1-SNAPSHOT' Conflicts: proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4df06620 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4df06620 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4df06620 Branch: refs/heads/master Commit: 4df06620171f155438cf1700a866cd42590cf108 Parents: 63c5d64 4737324 Author: Josh Elser Authored: Tue Sep 10 22:41:46 2013 -0400 Committer: Josh Elser Committed: Tue Sep 10 22:41:46 2013 -0400 ---------------------------------------------------------------------- .../core/iterators/user/ColumnSliceFilter.java | 115 ++++++++ .../iterators/user/ColumnSliceFilterTest.java | 277 +++++++++++++++++++ 2 files changed, 392 insertions(+) ----------------------------------------------------------------------