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/dc10e22d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc10e22d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc10e22d Branch: refs/heads/master Commit: dc10e22dc4ea19874328513ca9859bd19e848216 Parents: c3d5c1f 77b4507 Author: Keith Turner <ktur...@apache.org> Authored: Thu Jan 9 16:34:51 2014 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Thu Jan 9 16:34:51 2014 -0500 ---------------------------------------------------------------------- .../minicluster/MiniAccumuloCluster.java | 4 +--- .../minicluster/MiniAccumuloConfig.java | 20 ++-------------- .../minicluster/MiniAccumuloClusterGCTest.java | 25 -------------------- .../minicluster/MiniAccumuloClusterTest.java | 4 ++-- 4 files changed, 5 insertions(+), 48 deletions(-) ----------------------------------------------------------------------