Merge branch '2.4/t dev' into kilo

This commit is contained in:
Jason Ertel
2023-07-27 10:20:22 -04:00
164 changed files with 6408 additions and 29086 deletions

View File

@@ -651,7 +651,6 @@ main() {
echo ""
set_os
set_cron_service_name
if ! check_salt_master_status; then
echo "Could not talk to salt master"
echo "Please run 'systemctl status salt-master' to ensure the salt-master service is running and check the log at /opt/so/log/salt/master."