Merge branch '1.6.1-SNAPSHOT'
Conflicts:
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/668c9e3a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/668c9e3a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/668c9e3a
Branch: refs/heads/master
Commit: 668c9e3a8d556d362508fa98b09834fc4689fbe1
Parents: 7efff51 8b2f2dc
Author: Bill Havanki <bhava...@cloudera.com>
Authored: Fri Jun 13 09:40:15 2014 -0400
Committer: Bill Havanki <bhava...@cloudera.com>
Committed: Fri Jun 13 09:40:15 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/cluster/AccumuloConfig.java | 11 +++++++++++
.../minicluster/MiniAccumuloConfig.java | 14 ++++++++++++++
.../minicluster/MiniAccumuloRunner.java | 4 ++++
.../impl/MiniAccumuloClusterImpl.java | 7 ++-----
.../impl/MiniAccumuloConfigImpl.java | 20 ++++++++++++++++++++
.../impl/MiniAccumuloConfigImplTest.java | 8 ++++++++
6 files changed, 59 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668c9e3a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668c9e3a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
