Johanna Amann e382369091 Merge branch 'master' of https://github.com/sfinlon/zeek ... * 'master' of https://github.com/sfinlon/zeek: Fix CIF integration and add logging options to intel.log and added comments to code		2019-07-03 01:58:04 -07:00
..
files	GH-379: move catch-and-release and unified2 scripts to policy/	2019-06-05 13:33:45 -07:00
frameworks	GH-379: move catch-and-release and unified2 scripts to policy/	2019-06-05 13:33:45 -07:00
integration	Merge branch 'master' of https://github.com/sfinlon/zeek	2019-07-03 01:58:04 -07:00
misc	Remove deprecated open_log_file and log_file_name functions	2019-06-27 17:43:20 -07:00
protocols	GH-387: update Broker topic names to use "zeek/" prefix	2019-05-29 15:56:37 -07:00
tuning	Merge remote-tracking branch 'origin/topic/seth/zeek_init'	2019-04-19 11:24:29 -07:00