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/da242bc1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da242bc1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da242bc1 Branch: refs/heads/master Commit: da242bc1a879b90f2d221a5892de4078db392d31 Parents: e5c7854 b604e1d Author: Bill Havanki <bhava...@cloudera.com> Authored: Mon Jun 16 09:32:17 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Mon Jun 16 09:32:17 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/minicluster/MiniAccumuloConfig.java | 2 +- .../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/da242bc1/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java ----------------------------------------------------------------------
