Merge remote branch 'origin/master' into topic/bernhard/hyperloglog

This commit is contained in:
Bernhard Amann 2013-08-28 17:48:59 -07:00
commit dc9fd36497
117 changed files with 21121 additions and 20865 deletions

View file

@ -1,7 +1,7 @@
# @TEST-EXEC: btest-bg-run bro bro -b $SCRIPTS/file-analysis-test.bro %INPUT
# @TEST-EXEC: btest-bg-wait 8
# @TEST-EXEC: btest-diff bro/.stdout
# @TEST-EXEC: diff -q bro/nYgPNGLrZf9-file input.log
# @TEST-EXEC: diff -q bro/FK8WqY1Q9U1rVxnDge-file input.log
redef exit_only_after_terminate = T;