Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/34367d7d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/34367d7d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/34367d7d Branch: refs/heads/1.6.0-SNAPSHOT Commit: 34367d7dfe7f3db3d6d024ce9d0b63a7e07177e3 Parents: 420d7db 0328838 Author: Josh Elser <els...@apache.org> Authored: Mon Jan 20 13:53:49 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 20 13:53:49 2014 -0500 ---------------------------------------------------------------------- .../main/latex/accumulo_user_manual/chapters/administration.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/34367d7d/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex ----------------------------------------------------------------------