Merge branch '1.5.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5cfb88b2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5cfb88b2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5cfb88b2 Branch: refs/heads/ACCUMULO-1000 Commit: 5cfb88b219be5dbf0b4e0269593ca1424019d4f3 Parents: 8b0f573 7b61723 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Jul 17 14:09:52 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Jul 17 14:09:52 2013 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
