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/b33cb733 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b33cb733 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b33cb733 Branch: refs/heads/master Commit: b33cb733b004786f5699194ba990c6ad420e4263 Parents: cc617cd 72fd01f Author: Drew Farris <d...@apache.org> Authored: Tue May 13 23:03:10 2014 -0400 Committer: Drew Farris <d...@apache.org> Committed: Tue May 13 23:03:10 2014 -0400 ---------------------------------------------------------------------- bin/generate_monitor_certificate.sh | 4 ++-- test/system/continuous/datanode-agitator.pl | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
