Robin Sommer
6cedfe81bb
Updating submodule(s).
...
[nomail]
2019-09-09 11:35:19 +00:00
Jon Siwek
506773ba13
Updating submodule(s).
...
[nomail]
2019-09-06 12:57:24 -07:00
Jon Siwek
cc2ccb7a3c
Updating submodule(s).
...
[nomail]
2019-09-04 19:05:30 -07:00
Jon Siwek
f6f471f4b7
Update Broker include dir search path
...
Related to https://github.com/zeek/broker/issues/51
2019-09-04 16:29:04 -07:00
Jon Siwek
af5715ec5e
Updating submodule(s).
...
[nomail]
2019-09-04 15:35:57 -07:00
Jon Siwek
c88568db4d
Update embedded CAF to 0.17.1 (plus cherry-picked memory leak fix)
2019-09-04 13:42:55 -07:00
Jon Siwek
015464939e
Updating submodule(s).
...
[nomail]
2019-09-04 10:27:26 -07:00
Jon Siwek
d773b6986b
Updating submodule(s).
...
[nomail]
2019-09-03 11:33:22 -07:00
Jon Siwek
48873570b5
Updating submodule(s).
...
[nomail]
2019-08-23 06:37:27 -04:00
Robin Sommer
f592ffe672
Updating submodule.
2019-08-16 18:01:59 +00:00
Jon Siwek
814d0ea969
Updating submodule(s).
...
[nomail]
2019-08-14 13:26:39 -07:00
Jon Siwek
6a3e53547c
Updating submodule(s).
...
[nomail]
2019-08-14 10:18:34 -07:00
Robin Sommer
4ee9276e3a
Updating submodule(s).
...
[nomail]
2019-08-13 23:41:55 +00:00
Jon Siwek
9ccf3549fd
Merge remote-tracking branch 'origin/topic/timw/360-log-gzip'
...
* origin/topic/timw/360-log-gzip:
Add new LogAscii::gzip_file_extension option.
Adjusted documentation during merge.
2019-08-13 13:49:45 -07:00
Jon Siwek
d726e44e0e
Updating CHANGES and VERSION.
2019-08-09 09:15:22 -07:00
Jon Siwek
ba56cf62a7
Change version to 3.1.0-dev
2019-08-08 16:08:50 -07:00
Johanna Amann
7521fec5b3
Update submodule
...
[nomail]
2019-08-06 11:49:12 -07:00
Jon Siwek
5f4c04c900
Updating submodule(s).
...
[nomail]
2019-08-02 18:24:51 -07:00
Jon Siwek
21bc1b6703
Updating submodule(s).
...
[nomail]
2019-08-01 12:07:26 -07:00
Jon Siwek
68b0e1d54d
Updating submodule(s).
...
[nomail]
2019-08-01 11:22:26 -07:00
Jon Siwek
1b7aa2dbd3
Updating submodule(s).
...
[nomail]
2019-07-29 20:10:58 -07:00
Robin Sommer
13c373086d
Merge remote-tracking branch 'origin/topic/zeke/closures'
2019-07-30 02:32:34 +00:00
Johanna Amann
95ce177682
Merge remote-tracking branch 'origin/topic/jsiwek/gh-488-new-versioning'
...
* origin/topic/jsiwek/gh-488-new-versioning:
Add release branches to Travis CI whitelist
GH-488: teach the Version module to parse new version scheme
2019-07-29 10:02:00 -07:00
Jon Siwek
0f5082585d
Updating submodule(s).
...
[nomail]
2019-07-26 16:16:23 -07:00
Zeke Medley
cef94832f1
Frame merge and cleanup for merge.
2019-07-25 11:19:17 -07:00
Jon Siwek
3ef5d522a2
Updating submodule(s).
...
[nomail]
2019-07-09 17:42:30 -07:00
Robin Sommer
57ee6ecf48
Updating submodule.
2019-07-03 02:53:30 +00:00
Jon Siwek
23a1815e29
Updating submodule(s).
...
[nomail]
2019-07-01 12:17:53 -07:00
Jon Siwek
962988e0b4
Updating submodule(s).
...
[nomail]
2019-07-01 10:40:48 -07:00
Robin Sommer
b9538045d5
Updating submodule.
2019-06-27 16:58:00 +00:00
Johanna Amann
10e25bd625
Update submodules
...
[nomail]
2019-06-25 10:47:07 -07:00
Johanna Amann
5f9a9bbcbe
Merge branch 'paraglob' of https://github.com/ZekeMedley/zeek
...
* 'paraglob' of https://github.com/ZekeMedley/zeek :
Add leak test to paraglob.
Catch paraglob serialization errors in DoClone.
Update paraglob serialization.
Stop execution on paraglob error.
Update paraglob submodule
Change C++11 detection in paraglob.
Make paraglob serializable and copyable.
Initial paraglob integration.
I made a bunch of small changes:
* paraglob now deals better with \0 characters
* I rolled back the changes to Binary Serialization format,
* there were some small formatting issue
* the error output was slightly unsafe
* build_unique is now in util.h.
and perhaps a few more small things.
2019-06-24 15:21:46 -07:00
Jon Siwek
6918e54936
Updating submodule(s).
...
[nomail]
2019-06-21 09:56:57 -07:00
Zeke Medley
a5f6757d7d
Merge remote-tracking branch 'upstream/master' into paraglob
2019-06-20 14:14:48 -07:00
Jon Siwek
8f668ce82c
Merge remote-tracking branch 'origin/topic/dnthayer/rename-to-zeek'
...
* origin/topic/dnthayer/rename-to-zeek:
Rename bro to zeek in error messages
2019-06-17 20:27:42 -07:00
Jon Siwek
b33926a8e1
Merge remote-tracking branch 'origin/topic/dnthayer/gh-313'
...
* origin/topic/dnthayer/gh-313:
Create local.zeek as symlink for upgrade installs
Rename directories from bro to zeek
2019-06-12 15:11:04 -07:00
Jon Siwek
0ab1f0fe25
Updating submodule(s).
...
[nomail]
2019-06-12 10:34:27 -07:00
Jon Siwek
e0f9b0829e
Adapt bro_plugin CMake macros to use zeek_plugin
2019-06-07 20:07:39 -07:00
Jon Siwek
05a58f90a2
Merge remote-tracking branch 'origin/topic/johanna/tls13-details'
...
* origin/topic/johanna/tls13-details:
Update SSL documentation.
support the newer TLS 1.3 key_share extension.
Include all data of the server-hello random
Parse pre-shared-key extension.
Added a small portability fix for the gmt_unix_time byte-swapping.
2019-06-07 14:06:11 -07:00
Jon Siwek
c6378c56e2
Update plugin unit tests to use --zeek-dist
2019-06-06 20:02:47 -07:00
Zeke Medley
145bfe50af
Update paraglob submodule
2019-06-06 15:35:02 -07:00
ZekeMedley
e100558658
Change C++11 detection in paraglob.
2019-06-05 12:33:20 -07:00
ZekeMedley
42b1f4fd2e
Make paraglob serializable and copyable.
2019-06-04 14:56:48 -07:00
ZekeMedley
e1520a0d67
Initial paraglob integration.
2019-06-04 14:24:51 -07:00
Jon Siwek
39c201f88e
Updating submodule(s).
...
[nomail]
2019-05-30 21:35:40 -07:00
Jon Siwek
c25520cf3f
Updating submodule(s).
...
[nomail]
2019-05-29 14:55:51 -07:00
Jon Siwek
574d2c363a
Merge remote-tracking branch 'origin/topic/jsiwek/broker-less-copies'
...
* origin/topic/jsiwek/broker-less-copies:
Reduce data copying in Broker message processing
2019-05-28 17:58:59 -07:00
Jon Siwek
4ff473a596
Updating submodule(s).
...
[nomail]
2019-05-28 14:07:35 -07:00
Jon Siwek
580822a32c
Merge remote-tracking branch 'origin/topic/dnthayer/gh-339'
...
* origin/topic/dnthayer/gh-339:
Rename all BRO-prefixed environment variables
2019-05-23 20:23:14 -07:00
Jon Siwek
ce17ae8ea2
Update broker unit test output.
...
Due to string representation of Broker vectors changing (they now
use parentheses instead of square brackets).
Related to https://github.com/zeek/broker/issues/43
2019-05-23 18:06:47 -07:00