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/b3c131f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3c131f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3c131f9

Branch: refs/heads/master
Commit: b3c131f9f540d3b8011796231be37d63b1a2f665
Parents: e163c34 5b76afc
Author: Josh Elser <els...@apache.org>
Authored: Mon May 18 16:53:08 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Mon May 18 16:53:08 2015 -0400

----------------------------------------------------------------------
 docs/src/main/asciidoc/chapters/administration.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to