Merge branch 'mac-with-existing-zookeeper' of github:tanadeau/accumulo This closes #29
Signed-off-by: Christopher Tubbs <ctubb...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/acf60826 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/acf60826 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/acf60826 Branch: refs/heads/master Commit: acf60826e25f943653fd7875d3b01ef43b7adf77 Parents: a9d1ad4 6c22aab Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed May 20 12:50:38 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed May 20 12:50:38 2015 -0400 ---------------------------------------------------------------------- minicluster/pom.xml | 10 ++ .../minicluster/MiniAccumuloRunner.java | 4 + .../impl/MiniAccumuloClusterImpl.java | 59 +++++----- .../impl/MiniAccumuloConfigImpl.java | 37 ++++++- ...niAccumuloClusterExistingZooKeepersTest.java | 107 +++++++++++++++++++ pom.xml | 12 +++ 6 files changed, 199 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/acf60826/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/acf60826/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/acf60826/pom.xml ----------------------------------------------------------------------
