Merge branch 'master' into topic/jsiwek/faf-updates

Conflicts:
	magic
This commit is contained in:
Jon Siwek 2013-07-25 10:02:26 -05:00
commit ac6b12b5d4
21 changed files with 158 additions and 32 deletions

View file

@ -0,0 +1,5 @@
# This tests the case where the DNS server responded with zero RRs.
#
# @TEST-EXEC: bro -r $TRACES/dns-two-responses.trace
# @TEST-EXEC: btest-diff dns.log
# @TEST-EXEC: btest-diff weird.log