CSEC_PUBLIC/securityonion
1
0 Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-11-05 12:08:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
3e97930506808b5c2768dde5f1cb9c25aaa6f96b
securityonion/salt/common/tools
T
History
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
..
sbin
Merge branch 'dev' into feature/script-fixes
2020-02-05 10:58:51 -05:00