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.5 to 25e514a
Date Tue, 04 Nov 2014 19:34:04 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 a53d39c1b -> 25e514a28


CLOUDSTACK-7384: UI > Instances > detailView > change service offering option >
hide it when VM state is Running and hyperviror is LXC.


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

Branch: refs/heads/4.5
Commit: 25e514a28e94ab32d452da45d8e6b42ab39ccffb
Parents: a53d39c1
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Nov 4 11:33:15 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Nov 4 11:33:15 2014 -0800

----------------------------------------------------------------------
 ui/scripts/instances.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25e514a2/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 838e4d5..3cf5dd6 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2253,8 +2253,8 @@
             allowedActions.push("destroy");            
             allowedActions.push("reinstall");
              
-            //when userVm is running, scaleUp is not supported for KVM
-            if (jsonObj.hypervisor != 'KVM') {
+            //when userVm is running, scaleUp is not supported for KVM, LXC
+            if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'LXC') {
             	allowedActions.push("scaleUp");
             }              
 


Mime
View raw message