cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 8e580cc
Date Fri, 22 Nov 2013 16:16:38 GMT
Updated Branches:
  refs/heads/master 386ee6bf3 -> 8e580cc41


CLOUDSTACK-5231: add helper messages for DynamicallyScalable and Routing


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

Branch: refs/heads/master
Commit: 8e580cc41184eac53969267234114d9d8ea23006
Parents: 386ee6b
Author: Yichi Lu <yichi.lu@sungard.com>
Authored: Thu Nov 21 23:21:42 2013 -0500
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Nov 22 17:15:59 2013 +0100

----------------------------------------------------------------------
 ui/scripts/docs.js      | 8 ++++++++
 ui/scripts/templates.js | 2 ++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e580cc4/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index e898a96..32237f3 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -1167,6 +1167,10 @@ cloudStack.docs = {
         desc: 'Whether the template is extractable or not',
         externalLink: ''
     },
+    helpRegisterTemplateDynamicallyScalable: {
+        desc: 'Check this if the template contains XS/VMWare tools to support dynamic scaling
of VM cpu/memory.',
+        externalLink: ''
+    },
     helpRegisterTemplatePasswordEnabled: {
         desc: 'Check this if the template has the password change script installed.',
         externalLink: ''
@@ -1179,6 +1183,10 @@ cloudStack.docs = {
         desc: 'Check this to make the template more prominent for users. The template will
appear in the Featured Templates list.',
         externalLink: ''
     },
+    helpRegisterTemplateRouting: {
+        desc: 'Check this if the template is used for deploying router.',
+        externalLink: ''
+    },
     // Upload volume
     helpUploadVolumeName: {
         desc: 'A unique name for the volume. This will be visible to users, so choose something
descriptive.',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e580cc4/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index f45c2d2..1100646 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -423,6 +423,7 @@
 
                                     isdynamicallyscalable: {
                                         label: "Dynamically Scalable",
+                                        docID: 'helpRegisterTemplateDynamicallyScalable',
                                         isBoolean: true
                                     },
 
@@ -441,6 +442,7 @@
                                     },
                                     isrouting: {
                                         label: 'label.routing',
+                                        docID: 'helpRegisterTemplateRouting',
                                         isBoolean: true,
                                         isHidden: true
                                     }


Mime
View raw message