Merge branch '1.6' into 1.7
Conflicts:
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0c72f25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0c72f25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0c72f25
Branch: refs/heads/master
Commit: e0c72f25064990d1e6d5f6f14dfda944a54d4371
Parents: e16a6fa 8c0d881
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Tue Jun 9 13:52:01 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Tue Jun 9 13:52:01 2015 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++
.../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0c72f25/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0c72f25/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --cc
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index ef498bf,8feef61..c8f65d2
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@@ -28,11 -29,11 +28,13 @@@ import org.apache.accumulo.core.conf.Cr
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.minicluster.MemoryUnit;
+ import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Holds configuration for {@link MiniAccumuloClusterImpl}. Required
configurations must be passed to constructor(s) and all other configurations
are optional.
