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/e48e51ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e48e51ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e48e51ea Branch: refs/heads/master Commit: e48e51ea21cacb3c472e00b410ecd939a9f54bd5 Parents: 5a3e4c4 3a1b387 Author: Josh Elser <els...@apache.org> Authored: Tue Apr 1 16:32:04 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Apr 1 16:32:04 2014 -0400 ---------------------------------------------------------------------- minicluster/pom.xml | 5 + .../accumulo/cluster/AccumuloCluster.java | 73 ++++++++++ .../accumulo/cluster/AccumuloClusters.java | 43 ++++++ .../apache/accumulo/cluster/AccumuloConfig.java | 140 +++++++++++++++++++ .../apache/accumulo/cluster/package-info.java | 27 ++++ .../impl/MiniAccumuloClusterImpl.java | 10 +- .../impl/MiniAccumuloConfigImpl.java | 25 +++- .../accumulo/cluster/AccumuloClustersTest.java | 63 +++++++++ 8 files changed, 383 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e48e51ea/minicluster/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e48e51ea/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------
