cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.2 to 50046c5
Date Tue, 30 Jul 2013 17:58:10 GMT
Updated Branches:
  refs/heads/4.2 474a763ee -> 50046c577


CLOUDSTACK-2990: UI > scale up VM dialog - add description 'For VMware-based Linux VMs,
please read the dynamic scaling section in the admin guide before scaling.'


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

Branch: refs/heads/4.2
Commit: 50046c5771cf3d2ee0306a7ac064d841eb6fc0de
Parents: 474a763
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jul 30 10:55:21 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jul 30 10:57:59 2013 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js | 4 ++--
 ui/scripts/system.js    | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50046c57/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index c3eb556..ed361c0 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1275,10 +1275,10 @@
                     },
 
                     scaleUp: {
-                        label: 'scaleUp VM',
+                        label: 'Scale UP Virtual Machine',
                         createForm: {
                             title: 'Scale UP Virtual Machine',
-                            label: 'Scale UP Virtual Machine',
+                            desc: 'For VMware-based Linux VMs, please read the dynamic scaling
section in the admin guide before scaling.',                            
                             fields: {
                                 serviceOffering: {
                                     label: 'label.compute.offering',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50046c57/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f25f461..a156a37 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6886,7 +6886,7 @@
                                                         label: 'scaleUp System VM',
                                                         createForm: {
                                                             title: 'label.change.service.offering',
-                                                            desc: '',
+                                                            desc: 'For VMware-based Linux
VMs, please read the dynamic scaling section in the admin guide before scaling.',  
                                                             fields: {
                                                                 serviceOfferingId: {
                                                                     label: 'label.compute.offering',
@@ -7917,9 +7917,8 @@
                                 label: 'scaleUp Router VM',
                                 createForm: {
                                     title: 'label.change.service.offering',
-                                    desc: '',
+                                    desc: 'For VMware-based Linux VMs, please read the dynamic
scaling section in the admin guide before scaling.',  
                                     fields: {
-
                                         serviceOfferingId: {
                                             label: 'label.compute.offering',
                                             select: function(args) {
@@ -8534,7 +8533,7 @@
                                 label: 'scaleUp System VM',
                                 createForm: {
                                     title: 'label.change.service.offering',
-                                    desc: '',
+                                    desc: 'For VMware-based Linux VMs, please read the dynamic
scaling section in the admin guide before scaling.',  
                                     fields: {
                                         serviceOfferingId: {
                                             label: 'label.compute.offering',


Mime
View raw message