Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 71FD2200C08 for ; Wed, 11 Jan 2017 07:49:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 709D4160B4E; Wed, 11 Jan 2017 06:49:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C1D66160B2E for ; Wed, 11 Jan 2017 07:49:09 +0100 (CET) Received: (qmail 88721 invoked by uid 500); 11 Jan 2017 06:49:09 -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 88711 invoked by uid 99); 11 Jan 2017 06:49:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jan 2017 06:49:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5F4CDFDC6; Wed, 11 Jan 2017 06:49:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: koushik@apache.org To: commits@cloudstack.apache.org Date: Wed, 11 Jan 2017 06:49:08 -0000 Message-Id: <7dc89e60343d45a9bc9805a1e0abba27@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 729ae6d archived-at: Wed, 11 Jan 2017 06:49:10 -0000 Repository: cloudstack Updated Branches: refs/heads/master bc86baeaa -> 729ae6d18 CLOUDSTACK-9650: Allow starting VMs regardless of cpu/memory cluster.disablethreshold setting Fixed the scope of configuration flag 'cluster.threshold.enabled' introduced as part of PR#1812 to global Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44a59652 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44a59652 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44a59652 Branch: refs/heads/master Commit: 44a59652489f4129fd09d4c8de0bb6f0247d8fd7 Parents: bc86bae Author: Koushik Das Authored: Tue Jan 10 16:08:59 2017 +0530 Committer: Koushik Das Committed: Tue Jan 10 16:08:59 2017 +0530 ---------------------------------------------------------------------- api/src/com/cloud/deploy/DeploymentClusterPlanner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44a59652/api/src/com/cloud/deploy/DeploymentClusterPlanner.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java b/api/src/com/cloud/deploy/DeploymentClusterPlanner.java index c2f0776..a668b79 100644 --- a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java +++ b/api/src/com/cloud/deploy/DeploymentClusterPlanner.java @@ -55,7 +55,7 @@ public interface DeploymentClusterPlanner extends DeploymentPlanner { "true", "Enable/Disable cluster thresholds. If disabled, an instance can start in a cluster even though the threshold may be crossed.", false, - ConfigKey.Scope.Zone); + ConfigKey.Scope.Global); /** * This is called to determine list of possible clusters where a virtual