58 commits

Author	SHA1	Message	Date
Bernhard Amann	2f48008c42	implement merging for top-k. ... I am not (entirely) sure that this is mathematically correct, but I am (more and more) getting the feeling that it... might be. In any case - this was the last step and now it should work in cluster settings.	2013-04-24 06:17:51 -07:00
Bernhard Amann	567fee6439	Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog-with-measurement ... Conflicts: scripts/base/frameworks/sumstats/plugins/__load__.bro	2013-04-23 15:27:17 -07:00
Bernhard Amann	de5769a88f	topk for sumstats	2013-04-23 15:19:01 -07:00
Seth Hall	91362717da	Renamed a plugin hook in sumstats framework.	2013-04-22 15:27:03 -04:00
Seth Hall	9574499382	Move loading variance back to where it should be alphabetically.	2013-04-22 14:15:37 -04:00
Bernhard Amann	dc18a6d6e3	Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog-with-measurement ... and fix up the hll scripts for it. Conflicts: scripts/base/frameworks/sumstats/plugins/__load__.bro testing/btest/scripts/base/frameworks/measurement/basic.bro	2013-04-16 05:25:10 -07:00
Seth Hall	1cac89e4f8	SumStats test checkpoint.	2013-04-16 00:54:41 -04:00
Seth Hall	fbe967e16a	Checkpoint for SumStats rename.	2013-04-15 15:12:28 -04:00