cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [41/50] [abbrv] git commit: updated refs/heads/rbac to 99bdc8d
Date Thu, 13 Mar 2014 18:06:28 GMT
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/6c035240
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c035240
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c035240

Branch: refs/heads/rbac
Commit: 6c035240ba4c28b8551a4a6aafe1f4a5b7709e13
Parents: 5685d14
Author: Daan Hoogland <dhoogland@schubergphilis.com>
Authored: Wed Mar 12 18:04:22 2014 +0100
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
Committed: Wed Mar 12 18:04:22 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/6c035240/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 cc932ef..6671bed 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1236,8 +1236,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


Mime
View raw message