You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ni...@apache.org on 2013/12/10 00:03:29 UTC

git commit: updated refs/heads/4.3 to ebbc929

Updated Branches:
  refs/heads/4.3 5d9335fcc -> ebbc9292f


CLOUDSTACK-3664:
scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check


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

Branch: refs/heads/4.3
Commit: ebbc9292f3530d060dfab2de376307a810ce01e6
Parents: 5d9335f
Author: Nitin Mehta <ni...@citrix.com>
Authored: Mon Dec 9 15:03:20 2013 -0800
Committer: Nitin Mehta <ni...@citrix.com>
Committed: Mon Dec 9 15:03:20 2013 -0800

----------------------------------------------------------------------
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebbc9292/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 32db6f0..85c5bc1 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3433,9 +3433,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
     }
 
     protected boolean sendCommandsToRouter(final VirtualRouter router, Commands cmds) throws AgentUnavailableException {
-        /*if(!checkRouterVersion(router)){
+        if(!checkRouterVersion(router)){
             throw new CloudRuntimeException("Router requires upgrade. Unable to send command to router:" + router.getId());
-        } */
+        }
         Answer[] answers = null;
         try {
             answers = _agentMgr.send(router.getHostId(), cmds);