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 <eric.new...@gmail.com> Authored: Fri Oct 2 13:15:30 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> 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(-) ----------------------------------------------------------------------