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