Commit Graph

5 Commits

Author SHA1 Message Date
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
William Wernert
f56811e745 [feat] Use setup user+pass for TheHive, Cortex, and Fleet as well 2020-07-10 14:40:04 -04:00
m0duspwnens
3cf31e2460 https://github.com/Security-Onion-Solutions/securityonion/issues/404 2020-07-09 11:27:06 -04:00
m0duspwnens
40f04ef6d0 merge with dev and fix conflicts 2020-05-27 13:54:08 -04:00
Wes Lambert
b26f6826dd Rename Hive to TheHive in several places 2020-05-27 17:17:55 +00:00