Merge branch '1.6' into 1.7
Conflicts:
docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c283f4ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c283f4ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c283f4ac
Branch: refs/heads/master
Commit: c283f4acbf80de9fb06a897525ab7bf66032d445
Parents: 69185ed 2f5c0e1
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Fri Feb 12 17:45:32 2016 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Fri Feb 12 17:45:32 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
