You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/17 12:18:18 UTC
[2/2] git commit: updated refs/heads/master to 85afa63
Re-run travis
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #456
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85afa63f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85afa63f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85afa63f
Branch: refs/heads/master
Commit: 85afa63f24e2058e6c3bb7db1751444f1b2aa7c6
Parents: b34ad4a
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Mon Jun 15 17:30:14 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Wed Jun 17 12:18:01 2015 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/IpAddressManagerImpl.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85afa63f/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index f73a549..552e56b 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -579,7 +579,6 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
}
IPAddressVO ip = markIpAsUnavailable(addrId);
-
if (ip == null) {
return true;
}