Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0ACEB1780B for ; Tue, 4 Nov 2014 19:34:05 +0000 (UTC) Received: (qmail 77596 invoked by uid 500); 4 Nov 2014 19:34:04 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 77565 invoked by uid 500); 4 Nov 2014 19:34:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 77556 invoked by uid 99); 4 Nov 2014 19:34:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 19:34:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9241C8AEA42; Tue, 4 Nov 2014 19:34:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <7709ed7aa1f74ac6970abc569690797c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.5 to 25e514a Date: Tue, 4 Nov 2014 19:34:04 +0000 (UTC) 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 Authored: Tue Nov 4 11:33:15 2014 -0800 Committer: Jessica Wang 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"); }