You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/10/03 23:58:18 UTC
[08/12] accumulo git commit: Merge branch '1.6' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30c6cb2a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/30c6cb2a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/30c6cb2a
Branch: refs/heads/master
Commit: 30c6cb2a03db12ef56ebd85fae8b2eca3c484e81
Parents: 3dfd048 f320385
Author: Josh Elser <jo...@gmail.com>
Authored: Sat Oct 3 21:55:02 2015 +0000
Committer: Josh Elser <jo...@gmail.com>
Committed: Sat Oct 3 21:55:02 2015 +0000
----------------------------------------------------------------------
.../accumulo/core/iterators/Combiner.java | 93 +++++++++-
.../core/iterators/CombinerTestUtil.java | 23 +++
.../iterators/user/BigDecimalCombinerTest.java | 6 +-
.../core/iterators/user/CombinerTest.java | 175 ++++++++++++++++---
fate/pom.xml | 4 +
.../java/org/apache/accumulo/fate/ZooStore.java | 27 ++-
.../accumulo/server/util/SendLogToChainsaw.java | 13 +-
.../accumulo/tserver/CompactionQueue.java | 10 +-
.../org/apache/accumulo/test/ExistingMacIT.java | 1 +
.../trace/instrument/TraceRunnable.java | 2 +-
10 files changed, 311 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/30c6cb2a/fate/pom.xml
----------------------------------------------------------------------