Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 12:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7254 commits 388 branches 197 tags 276 MiB
Commit graph

817 commits

Author SHA1 Message Date
Robin Sommer
54191cc390 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1719' 
BIT-1719 #merged

* origin/topic/dnthayer/ticket1719:
  Fix httpd.py test script for Py3 compatibility
 2016-10-10 08:24:04 -07:00
Robin Sommer
f7eab5ab52 Updating submodule(s). 
[nomail]
 2016-10-10 08:13:51 -07:00
Robin Sommer
84bfd53e52 Updating submodule(s). 
[nomail]
 2016-10-06 14:02:48 -07:00
Johanna Amann
3ef14000f3 Make elasticsearch orphaned instead of deprecated. 
Addresses BIT-1617
 2016-09-26 10:33:13 -07:00
Robin Sommer
0bc4a5ea52 Updating submodule(s). 
[nomail]
 2016-09-19 17:18:38 -07:00
Johanna Amann
ec0ffc5452 Update submodule 
[nomail]
 2016-08-22 15:41:46 -07:00
Johanna Amann
1f2dc28bf7 Update submodule 
[nomail]
 2016-08-19 07:58:46 -07:00
Johanna Amann
4238f67900 Update submodules 
[nomail]
 2016-08-17 09:25:49 -07:00
Johanna Amann
abbb01edb9 Update submodules 
[nomail]
 2016-08-11 07:58:17 -07:00
Johanna Amann
f9f948f617 Add netcontrol-connectors to aux 2016-08-10 10:16:10 -07:00
Johanna Amann
203e63416e Update submodule 
[nomail]
 2016-08-08 11:50:51 -07:00
Robin Sommer
01205492d1 NEWS update. 2016-08-05 18:24:38 -07:00
Robin Sommer
89610bf19b Updating submodule(s). 
[nomail]
 2016-08-05 15:43:52 -07:00
Robin Sommer
cf22492c3f Updating submodule(s). 
[nomail]
 2016-08-05 15:42:47 -07:00
Robin Sommer
2a854acd2b Revert "Merge branch 'topic/seth/smb'" 
This reverts commit 9d9c7bafd3, reversing
changes made to eeb8c0cbb0.

The SMB analyzer wasn't ready yet.
 2016-08-05 15:04:49 -07:00
Seth Hall
f03e4ce041 Updating broctl. 2016-08-05 14:22:18 -04:00
Seth Hall
f0bce636cf Merge remote-tracking branch 'origin/topic/dnthayer/ticket1627' 
* origin/topic/dnthayer/ticket1627:
  Add a test for starting a cluster with a logger node
  Update broctl submodule
  Update broctl submodule to branch topic/dnthayer/ticket1627
  Change how logger node is detected in cluster framework
  Update test baselines for the new logger node type
  Update docs for the new logger node type
  Add a new node type for logging
 2016-08-05 12:59:05 -04:00
Robin Sommer
3adad5e19a Fix some Coverity warnings. 2016-08-02 11:38:29 -07:00
Robin Sommer
a273143e7d Updating submodule(s). 
[nomail]
 2016-08-02 11:08:59 -07:00
Robin Sommer
4d446dc93c Merge branch 'patch-1' of https://github.com/moshekaplan/bro 
* 'patch-1' of https://github.com/moshekaplan/bro:
  Added String slicing (subscript) examples
 2016-08-02 11:05:59 -07:00
Robin Sommer
1f8eb0bbc3 Updating submodule(s). 
[nomail]
 2016-08-01 07:57:41 -07:00
Robin Sommer
d04239f418 Updating submodule(s). 
[nomail]
 2016-08-01 07:57:10 -07:00
Robin Sommer
af834410f6 Updating submodule(s). 
[nomail]
 2016-07-23 07:26:15 -07:00
Robin Sommer
163ee380d3 Updating submodule(s). 
[nomail]
 2016-07-23 07:25:52 -07:00
Robin Sommer
5738398935 Updating submodule(s). 
[nomail]
 2016-07-23 07:20:55 -07:00
Johanna Amann
697b59cdc8 Update submodules 
[nomail]
 2016-07-21 11:50:39 -07:00
Daniel Thayer
88d066e921 Update broctl submodule 2016-07-15 00:23:18 -05:00
Daniel Thayer
7491cbc327 Merge remote-tracking branch 'origin/master' into topic/dnthayer/ticket1627 2016-07-14 18:17:03 -05:00
Robin Sommer
aa33da2775 Updating submodule(s). 
[nomail]
 2016-07-08 12:40:15 -07:00
Robin Sommer
5eecb1e740 Updating submodule(s). 
[nomail]
 2016-07-08 12:39:45 -07:00
Daniel Thayer
5a557436f7 Update broctl submodule to branch topic/dnthayer/ticket1627 2016-07-05 12:11:12 -05:00
Seth Hall
9360112e8a Updating broctl pointer 2016-07-05 11:31:27 -04:00
Robin Sommer
6e483c1f4f Updating submodule(s). 
[nomail]
 2016-06-30 16:55:40 -07:00
Robin Sommer
d06a22968e Updating submodule(s). 
[nomail]
 2016-06-30 16:52:54 -07:00
Robin Sommer
716a07adde Updating submodule(s). 
[nomail]
 2016-06-30 16:50:22 -07:00
Robin Sommer
9632a1474c Updating submodule(s). 
[nomail]
 2016-06-30 14:10:18 -07:00
Seth Hall
98a272b9fd Merge branch 'master' of git.bro.org:bro 2016-06-28 11:17:54 -04:00
Seth Hall
1c4a9e6132 Updating the broctl pointer. 2016-06-28 11:17:38 -04:00
Johanna Amann
27a7edc0c5 Update submodule. 
[nomail]
 2016-06-27 10:37:47 -07:00
Robin Sommer
7ce220f8e7 Updating submodule(s). 
[nomail]
 2016-06-21 22:09:45 -07:00
Robin Sommer
ddabd13097 Updating submodule(s). 
[nomail]
 2016-06-14 17:43:09 -07:00
Robin Sommer
9da02ecae4 Merge branch 'topic/jgras/expire-redef' of https://github.com/J-Gras/bro 
Extended error handling a bit, and increased serialization
data format version.
 2016-06-14 17:22:25 -07:00
Robin Sommer
0c3cbf3852 Updating submodule(s). 
[nomail]
 2016-06-14 16:19:10 -07:00
Robin Sommer
0fa9590902 Updating submodule(s). 
[nomail]
 2016-05-23 08:26:52 -07:00
Robin Sommer
b1c0306e4a Updating submodule(s). 
[nomail]
 2016-05-17 16:26:45 -07:00
Robin Sommer
573b542646 Updating submodule(s). 
[nomail]
 2016-05-17 16:23:47 -07:00
Robin Sommer
e2dee49fc1 Fixing control frameworks net_stats and peer_status commands. 
Turns out the code implementing them went missing with the recent
merge of the stats changes.

For peer status, I removed most of the numbers that the code used to
return because (1) we don't have access to that data anymore, and (2)
even in 2.4 the numbers returned already didn't make sense (because
they were global values, not per peer). We could consider just
removing the peer_status command at all.
 2016-05-17 16:11:22 -07:00
Robin Sommer
7c1aab0ce5 Updating submodule(s). 
[nomail]
 2016-05-17 14:31:16 -07:00
Johanna Amann
4851cbc7cc Merge remote-tracking branch 'origin/topic/dnthayer/ticket1601' 
* origin/topic/dnthayer/ticket1601:
  Fix some failing plugin tests on OS X 10.11

BIT-1601 #merged
 2016-05-16 20:11:20 -07:00
Johanna Amann
49ca47895d Merge remote-tracking branch 'origin/topic/dnthayer/ticket1595' 
* origin/topic/dnthayer/ticket1595:
  Fix a bug in receiving remote logs via broker

BIT-1595 #merged
 2016-05-12 08:06:42 -07:00