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/efd6261b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/efd6261b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/efd6261b Branch: refs/heads/master Commit: efd6261be85f4d4a686df0540ed6116ca227de79 Parents: 5aec59a 2f7b9d3 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Mar 4 13:21:42 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Mar 4 13:21:42 2014 -0500 ---------------------------------------------------------------------- .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/efd6261b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------