mirror of
https://github.com/zeek/zeek.git
synced 2025-10-16 13:38:19 +00:00
Merge branch 'topic/christian/management-framework-tls'
* topic/christian/management-framework-tls:
Bump zeek-testing-cluster to pull in WebSocket TLS updates
Bump zeek-client to pull in TLS config updates
Management framework: add TLS options for controller's websocket server
(cherry picked from commit f38ac30418
)
This commit is contained in:
parent
1e6d1e1b12
commit
d0a64c35dc
4 changed files with 14 additions and 5 deletions
|
@ -1 +1 @@
|
|||
fc635b99a867a925dc23641e5bd37c93306bc981
|
||||
318f1209d92ca1c5e50c8d39af55e004e506a776
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue