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/f7777839 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7777839 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7777839 Branch: refs/heads/master Commit: f7777839d7b95a5f66b94a17f560ede38d27d45b Parents: f93803f e0c72f2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Jun 9 13:52:27 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Jun 9 13:52:27 2015 -0400 ---------------------------------------------------------------------- .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++ .../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7777839/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7777839/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java ----------------------------------------------------------------------
