Bernhard Amann
3e74cdc6e0
Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog
2013-05-03 22:58:02 -07:00
Robin Sommer
9d483b7e74
Fixing coverage.bare-mode-errors test.
2013-05-01 17:52:16 -07:00
Robin Sommer
b9249ecf9d
Layout tweaks for the sumstats code, and preliminary updates for NEWS.
...
The layout changes are mostly whitespace and some comment rewrapping.
No functional changes.
2013-04-28 15:35:21 -07:00
Bernhard Amann
5608caf79a
make error rate configureable
2013-04-25 14:20:13 -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
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