You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/10/02 19:16:09 UTC

[5/5] 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/17ae2f91
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17ae2f91
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17ae2f91

Branch: refs/heads/master
Commit: 17ae2f919024daef4a6b4dff7ac92aefd8805de2
Parents: 18e834e 0013e46
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 13:15:30 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 13:15:30 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(-)
----------------------------------------------------------------------