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

Merge remote-tracking branch 'origin/master' into topic/seth/sumstats-updates

Browse source 
Conflicts:
	scripts/base/frameworks/sumstats/cluster.bro
	scripts/base/frameworks/sumstats/plugins/average.bro
	scripts/base/frameworks/sumstats/plugins/max.bro
	scripts/base/frameworks/sumstats/plugins/min.bro
	scripts/base/frameworks/sumstats/plugins/sample.bro
	scripts/base/frameworks/sumstats/plugins/std-dev.bro
	scripts/base/frameworks/sumstats/plugins/sum.bro
	scripts/base/frameworks/sumstats/plugins/unique.bro
	scripts/base/frameworks/sumstats/plugins/variance.bro
	scripts/policy/protocols/http/detect-sqli.bro
	testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro
This commit is contained in:
Seth Hall 2013-05-21 22:33:16 -04:00
commit 0a18b62d12
349 changed files with 237121 additions and 160465 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/site/local.bro
View file

@ -13,7 +13,7 @@
# Log some information about web applications being used by users
# on your network.
@load misc/app-metrics
@load misc/app-stats
# Detect traceroute being run on the network.
@load misc/detect-traceroute