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/dbea7982 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbea7982 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbea7982 Branch: refs/heads/master Commit: dbea79825eb5b8882178cfaa09855b5704e890c4 Parents: eeca25d 25da2e3 Author: Josh Elser <els...@apache.org> Authored: Wed May 13 21:06:34 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 13 21:06:34 2015 -0400 ---------------------------------------------------------------------- .../standalone/StandaloneClusterControl.java | 19 +++++----- .../StandaloneClusterControlTest.java | 38 ++++++++++++++++++++ 2 files changed, 47 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
