Seth Hall d6a7322a75 Merge branch 'topic/jgras/intel-update' of https://github.com/J-Gras/bro into topic/seth/intel-update-merge ... # Conflicts: # testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log # testing/btest/Baseline/scripts.policy.frameworks.intel.seen.certs/intel-all.log		2016-08-02 15:50:43 -04:00
..
frameworks	Merge branch 'topic/jgras/intel-update' of https://github.com/J-Gras/bro into topic/seth/intel-update-merge	2016-08-02 15:50:43 -04:00
integration	Allow logging filters to inherit default path from stream.	2015-03-19 14:49:55 -05:00
misc	Removed app-stats scripts.	2016-06-17 11:55:26 -04:00
protocols	SMTP does not need to pull in the notice framework.	2016-06-23 13:22:16 -07:00
tuning	Move DataSeries and ElasticSearch into plugins.	2014-08-08 18:32:21 -07:00