Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72d83acd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72d83acd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72d83acd Branch: refs/heads/master Commit: 72d83acd29b2b208dc5dd81ff4758d3cfff570bd Parents: 071f6fe 84d614d Author: Josh Elser <els...@apache.org> Authored: Thu May 28 16:18:57 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu May 28 16:18:57 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d83acd/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------