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 2014/03/12 18:09:45 UTC
git commit: updated refs/heads/4.3-forward to 0379dbb
Repository: cloudstack
Updated Branches:
refs/heads/4.3-forward f78e7ae51 -> 0379dbb48
check-style: tabs to spaces
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0379dbb4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0379dbb4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0379dbb4
Branch: refs/heads/4.3-forward
Commit: 0379dbb489b2502b8cf89583afd1a1f3baec93a3
Parents: f78e7ae
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Mar 12 18:09:36 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Mar 12 18:09:36 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0379dbb4/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index d31bb1d..8bae584 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1240,8 +1240,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// 1) GuestType is Shared
boolean createVlan = (startIP != null && endIP != null && zone.getNetworkType() == NetworkType.Advanced
&& ((ntwkOff.getGuestType() == Network.GuestType.Shared)
- || (ntwkOff.getGuestType() == GuestType.Isolated &&
- !areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))));
+ || (ntwkOff.getGuestType() == GuestType.Isolated &&
+ !areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))));
if (!createVlan) {
// Only support advance shared network in IPv6, which means createVlan is a must