6 commits

Author	SHA1	Message	Date
Bernhard Amann	3e74cdc6e0	Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog	2013-05-03 22:58:02 -07:00
Bernhard Amann	d984243a77	duct-tape fix of values not propagating after intermediate check in cluster environments.	2013-05-02 11:34:33 -07:00
Bernhard Amann	6e532e8960	update cluster test to also use hll	2013-04-19 09:58:57 -07: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	437815454d	SumStats tests pass.	2013-04-15 15:28:11 -04:00
Seth Hall	fbe967e16a	Checkpoint for SumStats rename.	2013-04-15 15:12:28 -04:00