Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d639d8b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d639d8b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d639d8b Branch: refs/heads/master Commit: 7d639d8b8e7220700e4a51ad7d8b6b7dd05c52cc Parents: 6c76503 b65035a Author: Josh Elser <els...@apache.org> Authored: Thu Jun 12 20:48:58 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 12 20:48:58 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/iterators/Combiner.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
