From 0b11ca455aca9806cb772d464bba3cb6e99289db Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 18 Jan 2018 15:42:31 -0500 Subject: [PATCH] Merge branch 'fine-vmrc-warning' into '5.8.z' Add a warning for VMRC credentials when adding/editing a provider See merge request !5 (cherry picked from commit 742d595a4cb18445e646feb06df30bcf04484835) --- app/views/layouts/angular/_multi_auth_credentials.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/angular/_multi_auth_credentials.html.haml b/app/views/layouts/angular/_multi_auth_credentials.html.haml index 830716f0a9c..ad1da36d45d 100644 --- a/app/views/layouts/angular/_multi_auth_credentials.html.haml +++ b/app/views/layouts/angular/_multi_auth_credentials.html.haml @@ -332,7 +332,7 @@ .form-group .col-md-12 %span{:style => "color:black"} - = _("Used for VMRC connections to all VMs in this provider. If not set, the credentials from the Default tab will be used.") + = _("Used for VMRC connections to all VMs on this provider. If not set, the VMRC console access will be disabled for this provider.") - elsif controller_name == "ems_container" = miq_tab_content('metrics', 'default') do .form-group