Merge branch 'master' into topic/vladg/dhcp

This commit is contained in:
Vlad Grigorescu 2013-07-31 10:08:44 -04:00
commit 7ddacba1a3
20 changed files with 148 additions and 31 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