Merge branch '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/07604ca0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07604ca0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07604ca0 Branch: refs/heads/master Commit: 07604ca058c5927eb20468ab7c983f039243e145 Parents: 90b6619 7d70ef5 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Feb 28 12:52:30 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Feb 28 12:52:30 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/fate/zookeeper/ZooLock.java | 6 ++ .../test/functional/BackupMasterIT.java | 63 ++++++++++++++++++++ 2 files changed, 69 insertions(+) ----------------------------------------------------------------------
