William Wernert 16d6e116fa Merge branch 'dev' into foxtrot ...

# Conflicts:
#	salt/idstools/init.sls

2021-03-17 11:52:54 -04:00

..

etc

Pull in Suricata changes

2021-02-19 11:01:15 -05:00

sorules

Clean up on sid numbers

2021-02-23 15:42:58 -05:00

init.sls

Merge branch 'dev' into foxtrot

2021-03-17 11:52:54 -04:00

sync_files.sls

Reorder states in sync_files.sls

2021-03-17 10:46:17 -04:00