Merge remote-tracking branch 'origin/master' into topic/seth/intel-updates

This commit is contained in:
Seth Hall 2013-07-29 11:36:00 -04:00
commit d380161244
57 changed files with 13049 additions and 107 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