cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/master to 2571dd7
Date Fri, 10 Jan 2014 22:19:55 GMT
Updated Branches:
  refs/heads/master 96c6f6d15 -> 2571dd771


CLOUDSTACK-5829:
listvms should return the diskoffering id when deployed with an iso


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

Branch: refs/heads/master
Commit: 2571dd77134c2149a5a7f69c13ca044043c85fb6
Parents: 96c6f6d
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Fri Jan 10 14:18:59 2014 -0800
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Fri Jan 10 14:19:36 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2571dd77/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 d5b8c8c..82332b7 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3525,10 +3525,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
     }
 
     protected boolean sendCommandsToRouter(final VirtualRouter router, Commands cmds) throws
AgentUnavailableException {
-        /*if(!checkRouterVersion(router)){
+        if(!checkRouterVersion(router)){
             s_logger.debug("Router requires upgrade. Unable to send command to router:" +
router.getId());
             throw new CloudRuntimeException("Unable to send command. Upgrade in progress.
Please contact administrator.");
-        }*/
+        }
         Answer[] answers = null;
         try {
             answers = _agentMgr.send(router.getHostId(), cmds);


Mime
View raw message