Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab037802 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab037802 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab037802 Branch: refs/heads/master Commit: ab0378024c511795dfa971d201277c337d42d697 Parents: d40c887 ea78c28 Author: Josh Elser <els...@apache.org> Authored: Fri Jul 11 13:16:47 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Jul 11 13:16:47 2014 -0400 ---------------------------------------------------------------------- .../impl/MiniAccumuloClusterImpl.java | 25 +++++++- .../minicluster/impl/CleanShutdownMacTest.java | 61 ++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab037802/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------