William Wernert 571e97cdf7 Merge branch 'dev' into feature/setup ...

# Conflicts:
#	salt/thehive/scripts/cortex_init
#	salt/thehive/scripts/hive_init
#	setup/so-functions
#	setup/so-whiptail

2020-07-10 17:42:56 -04:00

..

maps

https://github.com/Security-Onion-Solutions/securityonion/issues/404

2020-07-09 11:27:06 -04:00

scripts

chmod +x script changes

2020-02-05 11:39:37 -05:00

tools/sbin

Merge branch 'dev' into feature/setup

2020-07-10 17:42:56 -04:00

init.sls

Set role

2020-07-10 19:35:27 +00:00