Jon Siwek 41dd0b98e9 Merge branch 'master' into topic/jsiwek/reorg-followup ... Conflicts: scripts/base/frameworks/cluster/setup-connections.bro scripts/base/frameworks/metrics/main.bro scripts/base/frameworks/notice/actions/email_admin.bro scripts/base/frameworks/notice/weird.bro scripts/base/protocols/mime/file-hash.bro scripts/base/protocols/mime/file-ident.bro scripts/policy/frameworks/communication/listen-clear.bro scripts/policy/frameworks/communication/listen-ssl.bro scripts/policy/frameworks/control/controller.bro scripts/policy/frameworks/metrics/http-example.bro scripts/policy/frameworks/metrics/ssl-example.bro scripts/policy/protocols/conn/scan.bro src/CMakeLists.txt		2011-08-15 15:34:25 -05:00
..
cluster	Merge branch 'master' into topic/jsiwek/reorg-followup	2011-08-15 15:34:25 -05:00
communication	Merge branch 'master' into topic/jsiwek/reorg-followup	2011-08-15 15:34:25 -05:00
control	Merge branch 'master' of ssh://git.bro-ids.org/bro	2011-08-05 23:11:40 -04:00
dpd	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
intel	Add a test that checks each individual script can be loaded in bare-mode.	2011-08-10 15:38:21 -05:00
logging	Merge branch 'master' into topic/jsiwek/reorg-followup	2011-08-15 15:34:25 -05:00
metrics	Merge branch 'master' into topic/jsiwek/reorg-followup	2011-08-15 15:34:25 -05:00
notice	Merge branch 'master' into topic/jsiwek/reorg-followup	2011-08-15 15:34:25 -05:00
packet-filter	Add a test that checks each individual script can be loaded in bare-mode.	2011-08-10 15:38:21 -05:00
reporter	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
signatures	Add a test that checks each individual script can be loaded in bare-mode.	2011-08-10 15:38:21 -05:00
software	Add a test that checks each individual script can be loaded in bare-mode.	2011-08-10 15:38:21 -05:00
time-machine	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00