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

..

automation

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

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

install_scripts

[refactor] Simplify ec2 detection + handling

2020-07-01 16:23:38 -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

Merge branch 'dev' into feature/setup

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

so-setup

Merge branch 'dev' into feature/setup

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

so-variables

[refactor][fix] Move nmcli status list gen to a function

2020-07-02 17:18:56 -04:00

so-whiptail

Merge branch 'dev' into feature/setup

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