Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be7a43f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be7a43f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be7a43f6 Branch: refs/heads/master Commit: be7a43f62c58ec28c6df09e5f5725c05fdf868bd Parents: c479e5f c390796 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Aug 7 14:38:06 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Aug 7 14:38:06 2014 -0400 ---------------------------------------------------------------------- docs/src/main/asciidoc/chapters/administration.txt | 4 ++++ docs/src/main/asciidoc/chapters/clients.txt | 10 ++++++++++ 2 files changed, 14 insertions(+) ----------------------------------------------------------------------
