Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42c8808d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42c8808d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42c8808d Branch: refs/heads/1.6.1-SNAPSHOT Commit: 42c8808d715cf041d57c6372ed02ac85fdc67cf8 Parents: 4135e4f b0c3ba8 Author: Josh Elser <els...@apache.org> Authored: Wed Sep 3 13:29:37 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Sep 3 13:29:37 2014 -0400 ---------------------------------------------------------------------- .../core/iterators/SkippingIterator.java | 13 +++- .../core/iterators/system/HeapIterator.java | 4 + .../system/SourceSwitchingIterator.java | 77 +++++++++++--------- .../iterators/system/SynchronizedIterator.java | 23 +++--- 4 files changed, 66 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
