You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2017/01/11 06:49:08 UTC

[1/2] git commit: updated refs/heads/master to 729ae6d

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 <ko...@apache.org>
Authored: Tue Jan 10 16:08:59 2017 +0530
Committer: Koushik Das <ko...@apache.org>
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


[2/2] git commit: updated refs/heads/master to 729ae6d

Posted by ko...@apache.org.
Merge pull request #1899 from Accelerite/CLOUDSTACK-9650

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

* pr/1899:
  CLOUDSTACK-9650: Allow starting VMs regardless of cpu/memory cluster.disablethreshold setting

Signed-off-by: Koushik Das <ko...@apache.org>


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

Branch: refs/heads/master
Commit: 729ae6d186786b8b7c79a99bb7a769fff93e399b
Parents: bc86bae 44a5965
Author: Koushik Das <ko...@apache.org>
Authored: Wed Jan 11 12:07:25 2017 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Wed Jan 11 12:16:34 2017 +0530

----------------------------------------------------------------------
 api/src/com/cloud/deploy/DeploymentClusterPlanner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------