Merge branch '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/e98d81bb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e98d81bb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e98d81bb Branch: refs/heads/master Commit: e98d81bbe7d45bf870eb0ed9f1d4ae2cf4944a50 Parents: 4a4f546 42c8808 Author: Josh Elser <els...@apache.org> Authored: Wed Sep 3 13:29:47 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Sep 3 13:29:47 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(-) ----------------------------------------------------------------------
