Merge branch '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/52565839 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52565839 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52565839 Branch: refs/heads/master Commit: 52565839e370110a9cdea51e1ca4392e11e377ee Parents: 0fca7dc 0b79ee8 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Apr 22 14:04:19 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Apr 22 14:04:19 2014 -0400 ---------------------------------------------------------------------- .../minicluster/impl/MiniAccumuloClusterImpl.java | 12 ++++++------ .../apache/accumulo/test/functional/ReadWriteIT.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/52565839/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------
