Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0d0bb915 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d0bb915 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d0bb915 Branch: refs/heads/master Commit: 0d0bb9158e956333898c26b580f2d46667ea0820 Parents: 624c1f9 20e2b0a Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Mar 26 13:07:40 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Mar 26 13:07:40 2014 -0400 ---------------------------------------------------------------------- .../accumulo/core/iterators/Combiner.java | 21 ++++++-------------- 1 file changed, 6 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
