Robin Sommer 26ff8e1dab Merge remote branch 'origin/topic/seth/notice-email-delay' ... * origin/topic/seth/notice-email-delay: The hostname notice email extension works now. Fixed more bugs with delayed emails. Working around a problem with setting default container types. Ugh, still major failure. I'm just cutting the timeout handling for now. Fixed a small bug major problem with email delay timeout catching. Initial fixes for the problem of async actions with notice email extensions. Closes #727.		2011-12-19 07:10:28 -08:00
..
frameworks	Merge remote branch 'origin/topic/seth/notice-email-delay'	2011-12-19 07:10:28 -08:00
misc	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
protocols	Merge remote branch 'origin/topic/seth/dns-updates'	2011-12-18 15:20:00 -08:00
utils	Merge branch 'master' into topic/jsiwek/reorg-followup	2011-08-15 15:34:25 -05:00
init-bare.bro	Removed unused script code from init-bare.bro	2011-10-07 13:31:28 -04:00
init-default.bro	Metrics framework update. Mostly to make metrics work on clusters.	2011-08-15 15:57:48 -04:00