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/5aec59af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5aec59af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5aec59af Branch: refs/heads/master Commit: 5aec59afc7a81bbd437f661885190df625e480ef Parents: d7e939f cf61a3c Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Mar 4 12:47:20 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Mar 4 12:47:20 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/fate/zookeeper/ZooLock.java | 43 +++++++++++++---- .../java/org/apache/accumulo/master/Master.java | 1 + .../test/continuous/ContinuousBatchWalker.java | 2 +- .../test/continuous/ContinuousIngest.java | 9 ++-- .../test/continuous/ContinuousQuery.java | 2 +- .../test/continuous/ContinuousScanner.java | 2 +- .../test/continuous/ContinuousUtil.java | 49 ++++++++++++++++++++ .../test/continuous/ContinuousWalk.java | 2 +- 8 files changed, 91 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
