Robin Sommer 83eae53f54 Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' ... BIT-1054 #merged * origin/topic/seth/unified2-analyzer: Fixes in case a packet isn't seen that matches an event. Finished work on unified2 analyzer. Fixed some tests. Working unified2 analyzer. Unified2 file analyzer updated to new plugin style. Adding the unified2 analyzer. Conflicts: testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log		2013-08-13 18:37:52 -07:00
..
files	Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer'	2013-08-13 18:37:52 -07:00
frameworks	Fix a major memory issue in the SumStats framework.	2013-08-03 01:57:51 -04:00
misc	Merge remote-tracking branch 'origin/fastpath'	2012-12-14 14:34:51 -08:00
protocols	Merge branch 'topic/robin/dnp3-merge-v3'	2013-08-12 11:39:03 -07:00
utils	Fixed some tests.	2013-08-12 15:31:31 -04:00
init-bare.bro	Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer'	2013-08-13 18:37:52 -07:00
init-default.bro	Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer'	2013-08-13 18:37:52 -07:00