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/11d724e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11d724e8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/11d724e8 Branch: refs/heads/master Commit: 11d724e8793f963c76f247d0827995a435c4e11c Parents: 2b3202a 18a5500 Author: Bill Havanki <bhava...@cloudera.com> Authored: Fri Feb 28 15:09:06 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Fri Feb 28 15:09:06 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/fate/zookeeper/ZooLock.java | 43 +++++++++++++++----- .../java/org/apache/accumulo/master/Master.java | 1 + 2 files changed, 34 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/11d724e8/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
