You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/06/16 00:38:02 UTC
[21/51] [abbrv] git commit: Fixed ip assoc
Fixed ip assoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6ab7a607
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6ab7a607
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6ab7a607
Branch: refs/heads/vpc
Commit: 6ab7a6075dfad1e4d917dfd8ad7ec4f7c2239fe3
Parents: e177b8d
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jun 11 17:00:39 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jun 15 14:29:27 2012 -0700
----------------------------------------------------------------------
.../com/cloud/api/commands/AssociateIPAddrCmd.java | 4 +---
wscript | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6ab7a607/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java b/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
index b749ab3..7b8e41d 100644
--- a/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
+++ b/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
@@ -231,9 +231,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
IpAddress result = null;
- if (getVpcId() != null) {
- result = _networkService.associateIP(getEntityId(), getNetworkId(), getVpcId());
- }
+ result = _networkService.associateIP(getEntityId(), getNetworkId(), getVpcId());
if (result != null) {
IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(result);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6ab7a607/wscript
----------------------------------------------------------------------
diff --git a/wscript b/wscript
index a25cb00..c675e01 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@
# if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
-VERSION = '3.0.3.2012-06-11T22:43:41Z'
+VERSION = '3.0.3.2012-06-11T23:14:43Z'
APPNAME = 'cloud'
import shutil,os