Merge branch '1.5.2-SNAPSHOT' into 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/b65035a3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b65035a3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b65035a3 Branch: refs/heads/master Commit: b65035a31f0cc8470eb1302100c2a16bdcd4fa37 Parents: 2968fdf a3a8641 Author: Josh Elser <els...@apache.org> Authored: Thu Jun 12 20:48:52 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 12 20:48:52 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/iterators/Combiner.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b65035a3/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java ----------------------------------------------------------------------
