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/420d7db3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/420d7db3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/420d7db3 Branch: refs/heads/master Commit: 420d7db3bee1968eea238eabbbfefd8163100ce0 Parents: 71b2bae 1f99e6e Author: Josh Elser <els...@apache.org> Authored: Mon Jan 20 12:24:52 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 20 12:24:52 2014 -0500 ---------------------------------------------------------------------- .../accumulo_user_manual/chapters/administration.tex | 6 +++--- .../main/latex/accumulo_user_manual/chapters/design.tex | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/420d7db3/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex ----------------------------------------------------------------------
