9 commits

Author	SHA1	Message	Date
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
sfinlon	fe46035366	Fix CIF integration and add logging options to intel.log and added comments to code	2019-07-01 23:54:24 -04:00
Daniel Thayer	be182aac83	More bro-to-zeek renaming in scripts and other files	2019-05-16 02:36:41 -05:00
Daniel Thayer	18bd74454b	Rename all scripts to have ".zeek" file extension	2019-04-11 21:12:40 -05:00
Daniel Thayer	02d7e16997	Fix typos and formatting in the other policy docs	2013-10-21 02:37:00 -05:00
Jon Siwek	e0805498c6	Fix some warnings from sphinx when building docs.	2012-11-15 16:40:18 -06:00
Robin Sommer	edf6750e3d	Fixing tests after intel merge.	2012-11-05 16:25:59 -08:00
Seth Hall	1280825f1d	Small comment updates in the Intel framework CIF support.	2012-10-11 15:31:14 -04:00
Seth Hall	49a28b0bf7	Initial support for Bro's Intel framework with the Collective Intelligence Framework.	2012-10-10 11:16:11 -04:00