You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/03/18 00:42:40 UTC

[6/6] git commit: updated refs/heads/4.3 to 0810029

CLOUDSTACK-6246: UI > Infrastructure > SSL Certificate > update (1) mouse-over hint of SSL Certificate button. (2) description in SSL Certificate dialog.
(cherry picked from commit 33476b87351d10252911a4191986d5a5342d5597)

Signed-off-by: Animesh Chaturvedi <an...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0810029f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0810029f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0810029f

Branch: refs/heads/4.3
Commit: 0810029f274878eca8fd74b44ab1117054e929a5
Parents: d2bec2e
Author: Jessica Wang <je...@apache.org>
Authored: Mon Mar 17 15:41:48 2014 -0700
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Mon Mar 17 16:28:15 2014 -0700

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties | 2 +-
 ui/index.jsp                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0810029f/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 4032253..bccf71d 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1567,7 +1567,7 @@ message.tooltip.reserved.system.netmask=The network prefix that defines the pod
 message.tooltip.zone.name=A name for the zone.
 message.update.os.preference=Please choose a OS preference for this host.  All virtual instances with similar preferences will be first allocated to this host before choosing another.
 message.update.resource.count=Please confirm that you want to update resource counts for this account.
-message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance\:
+message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy and secondary storage virtual instance\:
 message.validate.instance.name=Instance name can not be longer than 63 characters. Only ASCII letters a~z, A~Z, digits 0~9, hyphen are allowed. Must start with a letter and end with a letter or a digit.
 message.virtual.network.desc=A dedicated virtualized network for your account.  The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.
 message.vm.create.template.confirm=Create Template will reboot the VM automatically.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0810029f/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 096747b..0cd5dc5a 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1044,7 +1044,7 @@
                     <div class="button refresh" id="refresh_button">
                         <span><fmt:message key="label.refresh"/></span>
                     </div>
-                    <div id="update_ssl_button" class="button action main-action reduced-hide lock" title="Updates your Console Proxy SSL Certificate">
+                    <div id="update_ssl_button" class="button action main-action reduced-hide lock" title="Updates your SSL Certificate">
                         <span class="icon">&nbsp;</span>
                         <span><fmt:message key="label.update.ssl.cert"/></span>
                     </div>