Merge branch 'master' into fastpath

This commit is contained in:
Jon Siwek 2011-09-01 16:32:29 -05:00
commit 9c0fc5fe48
4 changed files with 12 additions and 5 deletions

View file

@ -0,0 +1,2 @@
# @TEST-EXEC-FAIL: bro -r $TRACES/web.trace -f "bad filter"
# @TEST-EXEC: test -s .stderr