Merge branch '1.5' 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/0bcbab7d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bcbab7d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bcbab7d Branch: refs/heads/master Commit: 0bcbab7d6ab8bd0523b630bda1a1ff254e68f1cf Parents: dd9cc1c 5ac1b52 Author: Keith Turner <ktur...@apache.org> Authored: Fri Apr 24 19:39:04 2015 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Apr 24 19:39:04 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 58 +++++++++++--------- 1 file changed, 33 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
