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/5a42b1f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a42b1f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a42b1f2 Branch: refs/heads/1.7 Commit: 5a42b1f2b4a0add3e72d87b244c3ed161e99d43f Parents: f5c7f05 95e234c Author: Keith Turner <ktur...@apache.org> Authored: Wed Apr 22 15:14:26 2015 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Apr 22 15:14:26 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 29 +++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
