cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 255c847
Date Thu, 22 Aug 2013 15:40:28 GMT
Updated Branches:
  refs/heads/4.2-forward 69f6f49ae -> 255c8473d


CLOUDSTACK-4442: Source NAT not applied when network starts up

fixing the buid break introduced with prev commit for this bug


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

Branch: refs/heads/4.2-forward
Commit: 255c8473db7da27014a8e35d06ad133d1ce71d1f
Parents: 69f6f49
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Thu Aug 22 21:07:52 2013 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Thu Aug 22 21:07:52 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/255c8473/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index c3cf768..f81dee9 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -2000,7 +2000,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager,
VpcProvis
         boolean success = false;
         try {
             //unassign ip from the VPC router
-            success = _ntwkMgr.applyIpAssociations(_ntwkModel.getNetwork(networkId), true);
+            success = _ntwkMgr.applyIpAssociations(_ntwkModel.getNetwork(networkId), true,
false);
         } catch (ResourceUnavailableException ex) {
             throw new CloudRuntimeException("Failed to apply ip associations for network
id=" + networkId + 
                     " as a part of unassigning ip " + ipId + " from vpc", ex);


Mime
View raw message