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

Merge remote-tracking branch 'origin/master' into input

Browse source
This commit is contained in:
Bernhard Amann 2011-11-08 15:34:07 -08:00
commit c8a713da3d
7 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.0-beta-21 | 2011-11-06 19:27:22 -0800
* Quickstart doc fixes. (Jon Siwek)
2.0-beta-19 | 2011-11-03 17:41:00 -0700
* Fixing packet filter test. (Robin Sommer)

2
VERSION
View file

@ -1 +1 @@
2.0-beta-19
2.0-beta-21

2
aux/binpac

@ -1 +1 @@
Subproject commit e0b7d838c10da57d09a6645a64ee6fee47e0507d
Subproject commit 777b8a21c4c74e1f62e8b9896b082e8c059b539f

2
aux/bro-aux

@ -1 +1 @@
Subproject commit c876be28ab59a663ace668b63b14dc39936199df
Subproject commit 906f970df5f708582c7002069b787d5af586b46f

2
aux/broccoli

@ -1 +1 @@
Subproject commit 1553a19a559765989d7c0297e357f0402dff1a69
Subproject commit e02e3cc89a3efb3d7ec376154e24835b4b828be8

2
aux/broctl

@ -1 +1 @@
Subproject commit 32ffde0e08d7f33aa20954755586174b4aa041c9
Subproject commit 288c8568d7aaa38cf7c05833c133a91cbadbfce4

4
doc/quickstart.rst
View file

@ -126,7 +126,7 @@ and sendmail for sending emails.
against them.
Additional steps may be needed to `get the right GeoIP database
<geoip.html>`_.
<{{git('bro:doc/geoip.rst')}}>`_.
Compiling Bro Source Code
~~~~~~~~~~~~~~~~~~~~~~~~~
@ -441,7 +441,7 @@ that only takes the email action for SSH logins to a defined set of servers:
} &redef;
redef Notice::policy += {
[$result = Notice::ACTION_EMAIL,
[$action = Notice::ACTION_EMAIL,
$pred(n: Notice::Info) =
{
return n$note == SSH::Login && n$id$resp_h in watched_servers;