You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by kt...@apache.org on 2015/04/23 00:34:26 UTC

[3/4] accumulo git commit: Merge branch '1.6' into 1.7

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/master
Commit: 312b8762d03edce502cab1f0383f89a13caec6fa
Parents: d26fc14 5a42b1f
Author: Keith Turner <kt...@apache.org>
Authored: Wed Apr 22 18:15:44 2015 -0400
Committer: Keith Turner <kt...@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
----------------------------------------------------------------------