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/ada62bac Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ada62bac Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ada62bac Branch: refs/heads/master Commit: ada62bacbf391670eb0584861b8c00a7e1c6c7cb Parents: 81ab2d9 b5b38d8 Author: Keith Turner <ktur...@apache.org> Authored: Wed Feb 26 12:51:03 2014 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Feb 26 12:51:03 2014 -0500 ---------------------------------------------------------------------- .../accumulo/minicluster/MiniAccumuloConfig.java | 4 ++-- .../minicluster/impl/MiniAccumuloConfigImpl.java | 17 +++++++++++++++-- .../minicluster/MiniAccumuloClusterTest.java | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
