Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e88f6423 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e88f6423 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e88f6423 Branch: refs/heads/master Commit: e88f642357bf7d6169fd4376092205d512de6b63 Parents: f15a451 4815ec4 Author: Josh Elser <els...@apache.org> Authored: Sun May 31 16:12:48 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun May 31 16:12:48 2015 -0400 ---------------------------------------------------------------------- .../core/client/ClientConfiguration.java | 1 + .../impl/MiniAccumuloClusterControl.java | 31 +++++++++----------- 2 files changed, 15 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
