William Wernert be7dcdb442 Merge branch 'master' into release-merge-fix ...

# Conflicts:
#	README.md
#	VERIFY_ISO.md
#	VERSION
#	salt/docker_clean/init.sls
#	salt/soc/files/soc/changes.json

2021-03-01 10:45:51 -05:00

..

cron

Fix spacing

2021-01-20 13:10:33 +09:00

files

strelka logrotate - https://github.com/Security-Onion-Solutions/securityonion/issues/2736

2021-02-17 11:17:41 -05:00

tools/sbin

Merge branch 'master' into release-merge-fix

2021-03-01 10:45:51 -05:00

init.sls

Salt doesn't like a name starting with a non alpha-numeric char. Switch back to long if/then format

2021-02-18 14:51:09 -05:00