Merge branch '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/139a192e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/139a192e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/139a192e Branch: refs/heads/master Commit: 139a192ee4dbd49defb97d27c7b1d30eabd1dcb3 Parents: a9f1767 05254f3 Author: Josh Elser <els...@apache.org> Authored: Mon Mar 24 17:37:12 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Mon Mar 24 17:37:12 2014 -0700 ---------------------------------------------------------------------- .../accumulo_user_manual/chapters/design.tex | 24 ++++++++++- .../chapters/troubleshooting.tex | 43 +++++++++++++++++++- 2 files changed, 65 insertions(+), 2 deletions(-) ----------------------------------------------------------------------