Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc6e7769 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc6e7769 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc6e7769 Branch: refs/heads/master Commit: dc6e7769444fdbe368004f6cbe598e168417e012 Parents: 9defedf cfda8fa Author: Josh Elser <els...@apache.org> Authored: Tue Jun 24 14:25:43 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Jun 24 14:25:43 2014 -0400 ---------------------------------------------------------------------- .../accumulo/fate/zookeeper/ZooLockTest.java | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
