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

Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog

Browse source 
Conflicts:
	src/Func.cc
	src/probabilistic/CMakeLists.txt
This commit is contained in:
Bernhard Amann 2013-07-25 14:46:38 -07:00
commit 32c2885742
29 changed files with 10374 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/base/init-bare.bro
View file

@ -705,8 +705,6 @@ type entropy_test_result: record {
@load base/bif/strings.bif
@load base/bif/bro.bif
@load base/bif/reporter.bif
@load base/bif/bloom-filter.bif
@load base/bif/hyper-loglog.bif
## Deprecated. This is superseded by the new logging framework.
global log_file_name: function(tag: string): string &redef;
@ -3052,3 +3050,5 @@ const snaplen = 8192 &redef;
@load base/frameworks/input
@load base/frameworks/analyzer
@load base/frameworks/file-analysis
@load base/bif