cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [3/3] git commit: updated refs/heads/4.2 to ea738cb
Date Thu, 22 Aug 2013 21:58:28 GMT
CLOUDSTACK-4442: Source NAT not applied when network starts up

fixing the buid break introduced with prev commit for this bug
(cherry picked from commit 255c8473db7da27014a8e35d06ad133d1ce71d1f)

Signed-off-by: animesh <animesh@apache.org>


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

Branch: refs/heads/4.2
Commit: ea738cb5fb46877b67afb82c5aeb41b416994ea8
Parents: 1cd5383
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Thu Aug 22 21:07:52 2013 +0530
Committer: animesh <animesh@apache.org>
Committed: Thu Aug 22 13:51:34 2013 -0700

----------------------------------------------------------------------
 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/ea738cb5/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