Seth Hall 2509f79a10 Merge branch 'topic/jgras/bit-1507' of https://github.com/J-Gras/bro into J-Gras-topic/jgras/bit-1507		2016-01-21 10:45:42 -05:00
..
frameworks	Merge branch 'topic/jgras/bit-1507' of https://github.com/J-Gras/bro into J-Gras-topic/jgras/bit-1507	2016-01-21 10:45:42 -05:00
integration	Allow logging filters to inherit default path from stream.	2015-03-19 14:49:55 -05:00
misc	Allow logging filters to inherit default path from stream.	2015-03-19 14:49:55 -05:00
protocols	Fix potential race condition when logging VLAN info to conn.log	2015-11-05 12:14:05 -06:00
tuning	Move DataSeries and ElasticSearch into plugins.	2014-08-08 18:32:21 -07:00