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/f6a3f907 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6a3f907 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6a3f907 Branch: refs/heads/master Commit: f6a3f907b50b6de7cbde8331581ae6636048d9a1 Parents: 6248299 b65bdd6 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Dec 13 17:13:19 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Dec 13 17:13:19 2013 -0500 ---------------------------------------------------------------------- .../latex/accumulo_user_manual/chapters/administration.tex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6a3f907/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex ----------------------------------------------------------------------