Commit Graph

2 Commits

Author SHA1 Message Date
William Wernert
3e97930506 Merge branch 'dev' into feature/script-fixes
# Conflicts:
#	salt/auth/init.sls
#	salt/common/tools/sbin/so-bro-restart
#	salt/common/tools/sbin/so-bro-start
#	salt/common/tools/sbin/so-bro-stop
#	salt/wazuh/files/wazuh-manager-whitelist
2020-02-05 10:58:51 -05:00
Josh Brower
3fdc5fbef4 Dep Bro and enabled Zeek BPF 2020-01-30 09:45:02 -05:00