Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58cfee84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58cfee84 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58cfee84 Branch: refs/heads/master Commit: 58cfee84d1d052e0f48afc840996b24eb5f89516 Parents: 9abf6a3 312b876 Author: Keith Turner <ktur...@apache.org> Authored: Wed Apr 22 18:25:02 2015 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Apr 22 18:25:02 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 29 +++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
