cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [1/4] git commit: updated refs/heads/4.3 to ba9ae0c
Date Tue, 01 Jul 2014 09:39:58 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 51f145b56 -> ba9ae0c66


[UI] show isVolatile explanation text


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

Branch: refs/heads/4.3
Commit: 11f5f926b9e2956a8269bf857832cd7659ee3183
Parents: 51f145b
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Jul 1 10:54:31 2014 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Tue Jul 1 11:39:21 2014 +0200

----------------------------------------------------------------------
 ui/scripts/configuration.js | 4 ++--
 ui/scripts/docs.js          | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f5f926/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index e52f519..a4887be 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -199,8 +199,8 @@
                                     isVolatile: {
                                         label: 'label.volatile',
                                         isBoolean: true,
-                                        isChecked: false
-
+                                        isChecked: false,
+                                        docID: 'helpComputeOfferingIsVolatile'
                                     },
 
                                     deploymentPlanner: {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f5f926/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 2e451fd..014bcb4 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -273,6 +273,9 @@ cloudStack.docs = {
     helpComputeOfferingDomain: {
         desc: 'The domain to associate this compute offering with'
     },
+    helpComputeOfferingIsVolatile: {
+        desc: 'If checked, VMs created from this service offering will have their root disks
reset upon reboot. This is useful for secure environments that need a fresh start on every
boot and for desktops that should not retain state.'
+    },
     // Add disk offering
     helpDiskOfferingName: {
         desc: 'Any desired name for the offering',


Mime
View raw message