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/a12bde88 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a12bde88 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a12bde88 Branch: refs/heads/master Commit: a12bde8835ead60d7f0238b9c9769db663c6f344 Parents: b9bc5e2 853ed5b Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Feb 28 12:51:51 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Feb 28 12:51:51 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java | 6 ++++++ 1 file changed, 6 insertions(+) ----------------------------------------------------------------------
