You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/07/23 18:54:45 UTC

[20/50] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/048b308d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/048b308d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/048b308d

Branch: refs/heads/ACCUMULO-1000
Commit: 048b308d911b63542fd7ae11b7c68b60ff296a27
Parents: 88c11e6 388d58c
Author: Eric Newton <er...@gmail.com>
Authored: Wed Jul 17 14:13:23 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Jul 17 14:13:23 2013 -0400

----------------------------------------------------------------------
 .../apache/accumulo/fate/zookeeper/ZooLock.java |  5 +-
 .../test/functional/ZookeeperRestartIT.java     | 81 ++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)
----------------------------------------------------------------------