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 6985A18F4E for ; Fri, 2 Oct 2015 18:22:58 +0000 (UTC) Received: (qmail 52178 invoked by uid 500); 2 Oct 2015 18:22:58 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 52143 invoked by uid 500); 2 Oct 2015 18:22:58 -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 52134 invoked by uid 99); 2 Oct 2015 18:22:58 -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, 02 Oct 2015 18:22:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 312A9E0044; Fri, 2 Oct 2015 18:22:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Fri, 02 Oct 2015 18:22:58 -0000 Message-Id: <34e71ae421ef4ef3957e31d9c98cd71b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] accumulo git commit: Merge branch '1.7' Repository: accumulo Updated Branches: refs/heads/master 17ae2f919 -> 8f6ab6d3e 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/32907df8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32907df8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32907df8 Branch: refs/heads/master Commit: 32907df8fd14cbf2e34400c46bdabb9a634fa0c2 Parents: 18e834e 0013e46 Author: Eric C. Newton Authored: Fri Oct 2 13:15:30 2015 -0400 Committer: Eric C. Newton Committed: Fri Oct 2 14:21:40 2015 -0400 ---------------------------------------------------------------------- .../accumulo/core/iterators/Combiner.java | 97 ++++++++++- .../core/iterators/CombinerTestUtil.java | 23 +++ .../iterators/user/BigDecimalCombinerTest.java | 6 +- .../core/iterators/user/CombinerTest.java | 170 ++++++++++++++++--- .../accumulo/tserver/CompactionQueue.java | 10 +- 5 files changed, 280 insertions(+), 26 deletions(-) ----------------------------------------------------------------------