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/0ac6ee65 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ac6ee65 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ac6ee65 Branch: refs/heads/master Commit: 0ac6ee65f659ce85ddc5d88e2cda6f8aa5537f23 Parents: b16c645 e4f1df3 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Aug 13 12:34:47 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Aug 13 12:34:47 2015 -0400 ---------------------------------------------------------------------- docs/src/main/asciidoc/chapters/iterator_design.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
