Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/continuous/magitator.pl
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0833f4fa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0833f4fa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0833f4fa
Branch: refs/heads/master
Commit: 0833f4fab85951dca371afe87cf6cbabdf730161
Parents: c1fa557 6175d7a
Author: Josh Elser <els...@apache.org>
Authored: Wed Dec 4 23:51:04 2013 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Wed Dec 4 23:51:04 2013 -0500
----------------------------------------------------------------------
test/system/continuous/magitator.pl | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
