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

Merge branch 'master' into topic/jsiwek/broxygen

Browse source
This commit is contained in:
Jon Siwek 2013-11-04 10:17:24 -06:00
commit 96ed7aed1a
8 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CHANGES
View file

@ -1,4 +1,17 @@
2.2-beta-184 | 2013-11-03 22:53:42 -0800
* Remove swig-ruby from required packages section of install doc.
(Daniel Thayer)
2.2-beta-182 | 2013-11-01 05:26:05 -0700
* Adding source and original copyright statement to Mozilla cert
list. (Robin Sommer)
* Canonfying an intel test to not depend on output order. (Robin
Sommer)
2.2-beta-177 | 2013-10-30 04:54:54 -0700 2.2-beta-177 | 2013-10-30 04:54:54 -0700
* Fix thread processing/termination conditions. (Jon Siwek) * Fix thread processing/termination conditions. (Jon Siwek)

2
VERSION
View file

@ -1 +1 @@
2.2-beta-177 2.2-beta-184

2
aux/bro-aux

@ -1 +1 @@
Subproject commit d17f99107cc778627a0829f0ae416073bb1e20bb Subproject commit ce8a9733c4f8c4c8e8b2e9e440acfcf985f39cd8

2
aux/broccoli

@ -1 +1 @@
Subproject commit 5cc63348a4c3e54adaf59e5a85bec055025c6c1f Subproject commit 02e5c1e1f993ef0fea3e2a59c34df9f40839e398

2
aux/broctl

@ -1 +1 @@
Subproject commit cea34f6de7fc3b6f01921593797e5f0f197b67a7 Subproject commit aeb8501a50dcf33c53e7fe776b6e333327c11861

2
doc/install/install.rst
View file

@ -85,7 +85,7 @@ that ``bash`` and ``python`` are in your ``PATH``):
preferred Mac OS X package management system (e.g. MacPorts_, Fink_, preferred Mac OS X package management system (e.g. MacPorts_, Fink_,
or Homebrew_). or Homebrew_).
Specifically for MacPorts, the ``cmake``, ``swig``, ``swig-ruby``, Specifically for MacPorts, the ``cmake``, ``swig``,
``swig-python`` and ``file`` packages provide the required dependencies. ``swig-python`` and ``file`` packages provide the required dependencies.

10
scripts/base/protocols/ssl/mozilla-ca-list.bro
View file

@ -1,5 +1,13 @@
# Don't edit! This file is automatically generated. # Don't edit! This file is automatically generated.
# Generated at: Thu Sep 19 12:40:13 -0700 2013 # Generated at: 2013-11-01 05:23:08 -0700
# Generated from: http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
#
# The original source file comes with this licensing statement:
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@load base/protocols/ssl @load base/protocols/ssl
module SSL; module SSL;
redef root_certs += { redef root_certs += {

8
testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro
View file

@ -4,10 +4,10 @@
# @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT # @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT
# @TEST-EXEC: btest-bg-run worker-2 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT # @TEST-EXEC: btest-bg-run worker-2 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT
# @TEST-EXEC: btest-bg-wait -k 10 # @TEST-EXEC: btest-bg-wait -k 10
# @TEST-EXEC: btest-diff manager-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout
# @TEST-EXEC: btest-diff manager-1/intel.log # @TEST-EXEC: btest-diff manager-1/intel.log
# @TEST-EXEC: btest-diff worker-1/.stdout
# @TEST-EXEC: btest-diff worker-2/.stdout
@TEST-START-FILE cluster-layout.bro @TEST-START-FILE cluster-layout.bro
redef Cluster::nodes = { redef Cluster::nodes = {
@ -77,4 +77,4 @@ event remote_connection_closed(p: event_peer)
# Cascading termination # Cascading termination
#print fmt("disconnected from: %s", p); #print fmt("disconnected from: %s", p);
terminate_communication(); terminate_communication();
} }