Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b9fd3f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b9fd3f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b9fd3f5 Branch: refs/heads/master Commit: 3b9fd3f5c50e9aee668fa158bf99764c9a40f651 Parents: f09af2e 0f13792 Author: Josh Elser <els...@apache.org> Authored: Thu Apr 13 13:19:45 2017 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Apr 13 13:19:45 2017 -0400 ---------------------------------------------------------------------- .../accumulo/core/iterators/OrIterator.java | 263 +++++++++------ .../org/apache/accumulo/test/OrIteratorIT.java | 317 +++++++++++++++++++ 2 files changed, 479 insertions(+), 101 deletions(-) ----------------------------------------------------------------------
