William Wernert 6c9c60b8dd Merge branch 'master' into dev ...

# Conflicts:
#	VERSION

2020-07-24 11:50:34 -04:00

..

automation

change reference from bro to zeek

2020-07-17 14:41:44 -04:00

files

Misc pillars

2020-07-17 17:38:10 -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

change reference from bro to zeek

2020-07-17 14:41:44 -04:00

so-functions

Merge branch 'master' into dev

2020-07-24 11:50:34 -04:00

so-setup

When running in automated mode, cat all piped in input to setup log

2020-07-20 20:26:35 -04:00

so-variables

[refactor] Changes to storage requirements

2020-07-21 15:35:13 -04:00

so-whiptail

[fix] Add check for $TESTING

2020-07-21 16:43:21 -04:00