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/61f92790 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61f92790 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61f92790 Branch: refs/heads/master Commit: 61f927901a230128831c5401c4a3bc552e400f45 Parents: f98ddc2 4eda9ec Author: Josh Elser <els...@apache.org> Authored: Sun May 17 10:37:27 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun May 17 10:37:27 2015 -0400 ---------------------------------------------------------------------- .../standalone/StandaloneAccumuloCluster.java | 21 ++++++++++++++------ .../standalone/StandaloneClusterControl.java | 17 ++++++++-------- .../StandaloneClusterControlTest.java | 6 +++--- .../accumulo/harness/AccumuloClusterIT.java | 3 ++- .../StandaloneAccumuloClusterConfiguration.java | 11 +++++++--- .../apache/accumulo/test/ImportExportIT.java | 18 ++++++++++++++--- .../accumulo/test/functional/CleanTmpIT.java | 12 +++++------ 7 files changed, 57 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
