Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7e050a6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7e050a6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7e050a6 Branch: refs/heads/master Commit: e7e050a6b05b88c90a93405577e7a6eb0751f3c3 Parents: 4950870 c839e2f Author: Drew Farris <d...@apache.org> Authored: Sat Jun 7 10:11:52 2014 -0400 Committer: Drew Farris <d...@apache.org> Committed: Sat Jun 7 10:11:52 2014 -0400 ---------------------------------------------------------------------- .../system/continuous/continuous-env.sh.example | 30 ++++++++++++++------ test/system/continuous/start-agitator.sh | 12 ++++---- 2 files changed, 27 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
