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/c7062890 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c7062890 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c7062890 Branch: refs/heads/master Commit: c7062890d81599aad6103d3a26573a94f163be31 Parents: 7c40a17 360f0cf Author: John Vines <jvi...@gmail.com> Authored: Mon Dec 2 15:55:08 2013 -0500 Committer: John Vines <jvi...@gmail.com> Committed: Mon Dec 2 15:55:08 2013 -0500 ---------------------------------------------------------------------- bin/start-here.sh | 2 +- bin/stop-here.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) ----------------------------------------------------------------------