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/3086472f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3086472f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3086472f Branch: refs/heads/master Commit: 3086472f4a90ba35e22ee4db3b228f002f68ad1d Parents: 5abb916 b383cc5 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Apr 18 18:13:46 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Apr 18 18:13:46 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +- .../apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3086472f/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------
