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/87a684ab Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/87a684ab Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/87a684ab Branch: refs/heads/master Commit: 87a684ab0ad9caa507f41b0292763cf6d0ffcfd3 Parents: cf18632 367229e Author: Josh Elser <els...@apache.org> Authored: Tue Jul 15 18:08:25 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Jul 15 18:08:25 2014 -0400 ---------------------------------------------------------------------- .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 8 ++++++-- .../accumulo/minicluster/impl/CleanShutdownMacTest.java | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/87a684ab/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------
