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/312b8762 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/312b8762 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/312b8762 Branch: refs/heads/1.7 Commit: 312b8762d03edce502cab1f0383f89a13caec6fa Parents: d26fc14 5a42b1f Author: Keith Turner <ktur...@apache.org> Authored: Wed Apr 22 18:15:44 2015 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Apr 22 18:15:44 2015 -0400 ---------------------------------------------------------------------- .../system/SourceSwitchingIterator.java | 29 +++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/312b8762/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java ----------------------------------------------------------------------
