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/4879e7cc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4879e7cc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4879e7cc Branch: refs/heads/master Commit: 4879e7cca8ac606f7ac5d4ae675b1721fa02b627 Parents: f318c76 9e32bf8 Author: Josh Elser <els...@apache.org> Authored: Mon Feb 3 15:48:16 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 3 15:48:16 2014 -0500 ---------------------------------------------------------------------- .../core/client/ClientConfiguration.java | 51 ++++---------------- .../impl/MiniAccumuloClusterImpl.java | 1 + .../impl/MiniAccumuloConfigImpl.java | 16 +++--- .../concurrent/ChangePermissions.java | 4 +- 4 files changed, 20 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4879e7cc/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------
