Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18650ac6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18650ac6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18650ac6 Branch: refs/heads/1.7 Commit: 18650ac66d575659660efe33e8a505bf45765cfd Parents: 55981ad 0bcbab7 Author: Keith Turner <ktur...@apache.org> Authored: Fri Apr 24 19:39:32 2015 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Apr 24 19:39:32 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 58 +++++++++++--------- 1 file changed, 33 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18650ac6/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java ----------------------------------------------------------------------
