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 branch 'master' of git.bro.org:bro

Browse source
This commit is contained in:
Robin Sommer 2015-07-23 11:43:55 -07:00
commit a8f1ebf429
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
2.4-46 | 2015-07-22 10:56:40 -0500
* Fix broker python bindings install location to track --prefix.
(Jon Siwek)
2.4-45 | 2015-07-21 15:19:43 -0700
* Enabling Broker by default. This means CAF is now a required

2
VERSION
View file

@ -1 +1 @@
2.4-45
2.4-46

2
aux/broctl

@ -1 +1 @@
Subproject commit 54377d4746e2fd3ba7b7ca97e4a6ceccbd2cc236
Subproject commit 4ec6cb683d4477a0e5acb23e8eb0d0469c8a4166

2
configure vendored
View file

@ -161,7 +161,7 @@ while [ $# -ne 0 ]; do
append_cache_entry BRO_ROOT_DIR PATH $optarg
append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg/lib/broctl
if [ -n "$user_disabled_broker" ]; then
if [ -z "$user_disabled_broker" ]; then
append_cache_entry BROKER_PYTHON_HOME PATH $optarg
fi
;;