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/7fc8d834 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fc8d834 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7fc8d834 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 7fc8d83444364ea30f72f663b9015f6e1603c756 Parents: f6a3f90 c84acfc Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Dec 13 18:00:45 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Dec 13 18:00:45 2013 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/client/Instance.java | 6 +- .../apache/accumulo/core/data/RangeTest.java | 337 ++++++++++--------- .../accumulo/fate/zookeeper/ZooCache.java | 110 +++--- .../accumulo/fate/zookeeper/ZooReader.java | 39 ++- 4 files changed, 244 insertions(+), 248 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fc8d834/core/src/main/java/org/apache/accumulo/core/client/Instance.java ----------------------------------------------------------------------
