Robin Sommer 09ea84bb6e Merge remote-tracking branch 'origin/topic/johanna/netcontrol-improvements' ... Great work, and great documentation! I'm getting one test failure with scripts.base.frameworks.netcontrol.catch-and-release-cluster Going ahead and commiting, Jenkins will show the details I assume. BIT-1584 #merged * origin/topic/johanna/netcontrol-improvements: SMTP does not need to pull in the notice framework. Write NetControl framework documentation. Use NetControl for ACTION_DROP of notice framework. NetControl: slightly update catch and release logging NetControl: fix several small logging issues NetControl: more catch and release logging and cluster fix NetControl: rewrite catch and release and small fixes. NetControl: find_rules_subnet works in cluster mode NetControl: fix acld whitelist command NetControl: add rule exists as state besides added and failure. NetControl: Suppress duplicate "plugin activated" messages. NetControl: make new broker plugin options accessible NetControl: add predicates to broker plugin		2016-06-30 17:34:44 -07:00
..
files	Add some missing Bro script documentation	2016-05-05 16:35:31 -05:00
frameworks	Merge remote-tracking branch 'origin/topic/johanna/netcontrol-improvements'	2016-06-30 17:34:44 -07:00
misc	More stats improvements	2016-01-07 16:20:24 -05:00
protocols	Merge remote-tracking branch 'origin/topic/johanna/netcontrol-improvements'	2016-06-30 17:34:44 -07:00
utils	Merge remote-tracking branch 'origin/topic/johanna/rawleak'	2016-06-18 09:49:17 -07:00
init-bare.bro	Fix a number of documentation building errors	2016-06-27 12:41:40 -07:00
init-default.bro	Merge remote-tracking branch 'origin/master' into J-Gras-topic/jgras/bit-1507	2016-06-15 10:32:46 -04:00