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/1ee57286 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ee57286 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ee57286 Branch: refs/heads/master Commit: 1ee57286f49936f3dcd6d45b18fed574f49d5496 Parents: 3dc5630 7fc8d83 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Dec 13 18:01:22 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Dec 13 18:01:22 2013 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/client/Instance.java | 6 +- .../apache/accumulo/core/data/RangeTest.java | 337 ++++++++++--------- .../chapters/administration.tex | 8 +- .../accumulo/fate/zookeeper/ZooCache.java | 110 +++--- .../accumulo/fate/zookeeper/ZooReader.java | 39 ++- 5 files changed, 248 insertions(+), 252 deletions(-) ----------------------------------------------------------------------
