accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [08/10] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Thu, 15 May 2014 18:34:45 GMT
Merge branch '1.6.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c91d5540
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c91d5540
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c91d5540

Branch: refs/heads/master
Commit: c91d5540a9c16ada89b59516b7a9a07a5f7e7c94
Parents: 29e6dee a16f599
Author: Josh Elser <elserj@apache.org>
Authored: Thu May 15 14:33:06 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu May 15 14:33:06 2014 -0400

----------------------------------------------------------------------
 .../impl/MiniAccumuloClusterImpl.java           | 61 +++++++++++++++++---
 1 file changed, 53 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c91d5540/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --cc minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index e5dd18d,ef5056c..8e7757e
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@@ -72,9 -80,9 +79,10 @@@ import org.apache.hadoop.conf.Configura
  import org.apache.hadoop.fs.FileSystem;
  import org.apache.hadoop.hdfs.DFSConfigKeys;
  import org.apache.hadoop.hdfs.MiniDFSCluster;
+ import org.apache.log4j.Logger;
  import org.apache.zookeeper.server.ZooKeeperServerMain;
  
 +import com.google.common.base.Joiner;
  import com.google.common.base.Predicate;
  import com.google.common.collect.Maps;
  


Mime
View raw message