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

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Add curl to list of optional dependencies
  Update test and baseline for a recent doc test fix
This commit is contained in:
Robin Sommer 2013-10-25 15:48:15 -07:00
commit fbdbe6d35b
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,4 +1,12 @@
2.2-beta-161 | 2013-10-25 15:48:15 -0700
* Add curl to list of optional dependencies. It's used by the
active-http.bro script. (Daniel Thayer)
* Update test and baseline for a recent doc test fix. (Daniel
Thayer)
2.2-beta-158 | 2013-10-25 15:05:08 -0700 2.2-beta-158 | 2013-10-25 15:05:08 -0700
* Updating README with download/git information. (Robin Sommer) * Updating README with download/git information. (Robin Sommer)

2
VERSION
View file

@ -1 +1 @@
2.2-beta-158 2.2-beta-161

1
doc/install/install.rst
View file

@ -98,6 +98,7 @@ build time:
* LibGeoIP (for geo-locating IP addresses) * LibGeoIP (for geo-locating IP addresses)
* sendmail (enables Bro and BroControl to send mail) * sendmail (enables Bro and BroControl to send mail)
* gawk (enables all features of bro-cut) * gawk (enables all features of bro-cut)
* curl (used by a Bro script that implements active HTTP)
* gperftools (tcmalloc is used to improve memory and CPU usage) * gperftools (tcmalloc is used to improve memory and CPU usage)
* ipsumdump (for trace-summary; http://www.cs.ucla.edu/~kohler/ipsumdump) * ipsumdump (for trace-summary; http://www.cs.ucla.edu/~kohler/ipsumdump)
* Ruby executable, library, and headers (for Broccoli Ruby bindings) * Ruby executable, library, and headers (for Broccoli Ruby bindings)

3
testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_02_bro@2/output → testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_01_bro/output
View file

@ -1,9 +1,8 @@
# @TEST-EXEC: cat %INPUT >output && btest-diff output # @TEST-EXEC: cat %INPUT >output && btest-diff output
connection_record_02.bro connection_record_01.bro
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns
event connection_state_remove(c: connection) event connection_state_remove(c: connection)
{ {

3
testing/btest/doc/sphinx/include-doc_scripting_connection_record_02_bro@2.btest → testing/btest/doc/sphinx/include-doc_scripting_connection_record_01_bro.btest
View file

@ -1,9 +1,8 @@
# @TEST-EXEC: cat %INPUT >output && btest-diff output # @TEST-EXEC: cat %INPUT >output && btest-diff output
connection_record_02.bro connection_record_01.bro
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns
event connection_state_remove(c: connection) event connection_state_remove(c: connection)
{ {