Merge remote-tracking branch 'apache-committers/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/cfdc869a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfdc869a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cfdc869a Branch: refs/heads/master Commit: cfdc869a8a6fa882c692ef19aef0e3dd815947c5 Parents: edf8e28 c10ccf3 Author: Bill Slacum <ujustgotbi...@apache.org> Authored: Mon Nov 18 18:37:51 2013 -0500 Committer: Bill Slacum <ujustgotbi...@apache.org> Committed: Mon Nov 18 18:37:51 2013 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/client/Instance.java | 14 ++-- .../accumulo/core/client/ZooKeeperInstance.java | 6 +- .../simple/client/RandomBatchWriter.java | 20 +++--- .../test/MultiTableBatchWriterTest.java | 69 ++++++++++++++------ 4 files changed, 73 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
