Merge branch '1.5.1-SNAPSHOT' into 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/b33b5a15
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b33b5a15
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b33b5a15

Branch: refs/heads/master
Commit: b33b5a15aa27369759be33c96fbbfa20e296cfe8
Parents: e8f1a9e 7b1f303
Author: Josh Elser <els...@apache.org>
Authored: Thu Dec 12 14:52:28 2013 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Thu Dec 12 14:52:28 2013 -0500

----------------------------------------------------------------------
 test/system/continuous/README      | 2 +-
 test/system/continuous/agitator.pl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


Reply via email to