Mike Reeves 032c8ca4e9 Fix Conflicts

2020-06-11 13:14:11 -04:00

..

automation

[feat] Make automated webuser pass follow requirements

2020-06-10 14:19:24 -04:00

install_scripts

[refactor][WIP] Setup changes part 6

2020-04-18 19:10:33 -04:00

proxies

[fix] Only prompt user about network install on network install

2020-05-22 11:39:32 -04:00

public_keys

[feat] Update salt ver to 2019.2.4

2020-04-30 08:49:16 -04:00

yum_repos

Update wazuh.repo

2020-05-20 09:56:27 -04:00

so-common-functions

[fix] Always call set_default_log_size

2020-05-27 14:08:27 -04:00

so-functions

Fix Conflicts

2020-06-11 13:14:11 -04:00

so-setup

thehive setup fix

2020-06-09 12:16:39 -04:00

so-variables

fix how local salt and pillar dirs are created - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749

2020-05-28 08:57:07 -04:00

so-whiptail

Merge remote-tracking branch 'remotes/origin/dev' into feature/fleet-setup

2020-06-08 08:30:37 -04:00