Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e9ad5345 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e9ad5345 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e9ad5345 Branch: refs/heads/master Commit: e9ad5345f7e009e055fd74b3c33ec5225c55291a Parents: cf0bcb3 481b119 Author: Josh Elser <[email protected]> Authored: Mon Apr 27 23:11:23 2015 -0400 Committer: Josh Elser <[email protected]> Committed: Mon Apr 27 23:11:23 2015 -0400 ---------------------------------------------------------------------- .../core/iterators/SortedKeyValueIterator.java | 8 ++++++ .../main/asciidoc/chapters/iterator_design.txt | 27 +++++++++++++++----- 2 files changed, 29 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
