Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 17:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog-with-measurement

Browse source 
Conflicts:
	scripts/base/frameworks/sumstats/plugins/__load__.bro
This commit is contained in:
Bernhard Amann 2013-04-23 15:27:17 -07:00
commit 567fee6439
16 changed files with 35 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/frameworks/sumstats/plugins/hll_unique.bro
View file

@ -31,7 +31,7 @@ hook init_resultval_hook(r: Reducer, rv: ResultVal)
}
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{
if ( HLLUNIQUE in r$apply )
{