Merge remote-tracking branch 'mdrob/master'

closes #787

accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java

@@ -35,6 +35,7 @@ import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
+import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.MutationsRejectedException;
@@ -83,9 +84,9 @@ public class AccumuloClient extends DB {
     colFam = new Text(getProperties().getProperty("accumulo.columnFamily"));
     colFamBytes = colFam.toString().getBytes(UTF_8);
 
-    inst = new ZooKeeperInstance(
-        getProperties().getProperty("accumulo.instanceName"),
-        getProperties().getProperty("accumulo.zooKeepers"));
+    inst = new ZooKeeperInstance(new ClientConfiguration()
+        .withInstance(getProperties().getProperty("accumulo.instanceName"))
+        .withZkHosts(getProperties().getProperty("accumulo.zooKeepers")));
     try {
       String principal = getProperties().getProperty("accumulo.username");
       AuthenticationToken token =

accumulo/src/test/resources/log4j.properties

@@ -24,6 +24,6 @@ log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
 log4j.appender.stderr.layout.conversionPattern=%d{yyyy/MM/dd HH:mm:ss} %-5p %c %x - %m%n
 
 # Suppress messages from ZooKeeper
-log4j.logger.com.yahoo.ycsb.db.accumulo=INFO
+log4j.logger.com.yahoo.ycsb.db.accumulo=DEBUG
 log4j.logger.org.apache.zookeeper=ERROR
 log4j.logger.org.apache.accumulo=WARN

pom.xml

@@ -72,7 +72,7 @@ LICENSE file.
     <hbase098.version>0.98.14-hadoop2</hbase098.version>
     <hbase10.version>1.0.2</hbase10.version>
     <hbase12.version>1.2.5</hbase12.version>
-    <accumulo.version>1.6.0</accumulo.version>
+    <accumulo.version>1.7.2</accumulo.version>
     <cassandra.cql.version>3.0.0</cassandra.cql.version>
     <geode.version>1.2.0</geode.version>
     <azuredocumentdb.version>1.8.1</azuredocumentdb.version>