Johanna Amann 1f329ad541 Merge remote-tracking branch 'origin/topic/timw/150-to-json' ... * origin/topic/timw/150-to-json: Update submodules for JSON work Update unit tests for JSON logger to match new output Modify JSON log writer to use the external JSON library Update unit test output to match json.zeek being deprecated and slight format changes to JSON output Add proper JSON serialization via C++, deprecate json.zeek Add new method for escaping UTF8 strings for JSON output Move do_sub method from zeek.bif to StringVal class method Move record_fields method from zeek.bif to Val class method Add ToStdString method for StringVal		2019-07-11 11:17:32 -07:00
..
files	GH-379: move catch-and-release and unified2 scripts to policy/	2019-06-05 13:33:45 -07:00
frameworks	Merge remote-tracking branch 'origin/topic/timw/150-to-json'	2019-07-11 11:17:32 -07:00
misc	Deprecate functions with "bro" in them.	2019-06-05 16:18:57 -07:00
protocols	Fixed a small issue due to the name changes	2019-06-28 14:49:57 -04:00
utils	Update unit test output to match json.zeek being deprecated and slight format changes to JSON output	2019-07-02 13:14:52 -07:00