Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/24e62a08 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24e62a08 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24e62a08 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 24e62a088df03d40cab6bd01b063e17e096e97d5 Parents: 2af2515 b4a832d Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 10 10:14:57 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 10 10:14:57 2014 -0500 ---------------------------------------------------------------------- .../maven/plugin/AbstractAccumuloMojo.java | 13 +++++++++- .../minicluster/MiniAccumuloCluster.java | 4 +--- .../minicluster/MiniAccumuloConfig.java | 20 ++-------------- .../minicluster/MiniAccumuloClusterGCTest.java | 25 -------------------- .../minicluster/MiniAccumuloClusterTest.java | 4 ++-- pom.xml | 2 +- 6 files changed, 18 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
