Robin Sommer 00d94f1bbc Merge remote-tracking branch 'origin/topic/seth/stats-improvement' ... (Cleaned up some code a little bit.) * origin/topic/seth/stats-improvement: Fixing tests for stats improvements Rename the reporting interval variable for stats. Removing more broken functionality due to changed stats apis. Removing some references to resource_usage() Removing Broker stats, it was broken and incomplete. Fixing default stats collection interval to every 5 minutes. Add DNS stats to the stats.log Small stats script tweaks and beginning broker stats. Continued stats cleanup and extension. More stats collection extensions. More stats improvements Slight change to Mach API for collecting memory usage. Fixing some small mistakes. Updating the cmake submodule for the stats updates. Fix memory usage collection on Mac OS X. Cleaned up stats collection. BIT-1581 #merged		2016-05-07 11:51:35 -07:00
..
files	Add some missing Bro script documentation	2016-05-05 16:35:31 -05:00
frameworks	Merge remote-tracking branch 'origin/topic/seth/stats-improvement'	2016-05-07 11:51:35 -07:00
misc	More stats improvements	2016-01-07 16:20:24 -05:00
protocols	Merge remote-tracking branch 'origin/topic/dnthayer/doc-improvements'	2016-05-06 16:59:07 -07:00
utils	Merge remote-tracking branch 'origin/topic/johanna/netcontrol'	2016-03-11 14:29:23 -08:00
init-bare.bro	Merge remote-tracking branch 'origin/topic/seth/stats-improvement'	2016-05-07 11:51:35 -07:00
init-default.bro	Merge remote-tracking branch 'origin/master' into topic/johanna/xmpp-starttls	2016-04-29 12:56:12 -07:00