Bernhard Amann eacdffff90 Merge remote-tracking branch 'origin/master' into topic/bernhard/software ... Conflicts: scripts/base/frameworks/software/main.bro scripts/policy/protocols/ftp/software.bro		2012-01-20 12:51:58 -08:00
..
cluster	Increase timeout interval of communication-related btests.	2011-12-19 13:12:02 -06:00
communication	Make communication log baseline test more reliable.	2012-01-13 16:06:44 -06:00
control	Increase timeout interval of communication-related btests.	2011-12-19 13:12:02 -06:00
intel	Reorganizing btest/policy directory to match new scripts/ organization	2011-08-11 10:43:11 -05:00
logging	Merge branch 'master' into fastpath	2011-12-20 11:45:50 -06:00
metrics	Increase timeout interval of communication-related btests.	2011-12-19 13:12:02 -06:00
notice	Merge remote-tracking branch 'origin/topic/robin/pp-alarms'	2012-01-04 13:41:28 -05:00
packet-filter	Add a Reporter::fatal BIF.	2011-08-25 13:13:39 -05:00
software	start reworking interface of software framework. working apart from detect-webapps.bro, which direcly manipulates a no longer available interface...	2011-12-09 16:47:58 -08:00