Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/56af3a23 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/56af3a23 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/56af3a23 Branch: refs/heads/master Commit: 56af3a236cf45da49a54d1f7422554fbc8138f8e Parents: e3bd30e 104eeb3 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 22 17:03:58 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 22 17:03:58 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/cluster/ClusterUser.java | 6 +++--- .../apache/accumulo/harness/AccumuloClusterHarness.java | 5 ++--- .../apache/accumulo/harness/SharedMiniClusterBase.java | 11 ++++------- .../harness/conf/AccumuloMiniClusterConfiguration.java | 5 ++--- .../conf/StandaloneAccumuloClusterConfiguration.java | 6 +++--- .../org/apache/accumulo/test/randomwalk/Environment.java | 6 +++--- 6 files changed, 17 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
