cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: refs/heads/master - Revert "CLOUDSTACK-737"
Date Fri, 08 Feb 2013 18:46:03 GMT
Updated Branches:
  refs/heads/master 0a6c6bb25 -> dd67cfc5d


Revert "CLOUDSTACK-737"

This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java


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

Branch: refs/heads/master
Commit: dd67cfc5d07783cd4f8cf3480323f3ed030cc216
Parents: 0a6c6bb
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Fri Feb 8 10:45:40 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Fri Feb 8 10:45:40 2013 -0800

----------------------------------------------------------------------
 .../src/com/cloud/network/NetworkManagerImpl.java  |    8 ++++++++
 .../com/cloud/resource/ResourceManagerImpl.java    |    5 +++++
 2 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd67cfc5/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 57555a1..19c1d9f 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1855,6 +1855,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
         } else if (zone.getNetworkType() == NetworkType.Advanced) {
             if (zone.isSecurityGroupEnabled()) {
 <<<<<<< HEAD
+<<<<<<< HEAD
             	if (ipv6) {
             		throw new InvalidParameterValueException("IPv6 is not supported with security
group!");
             	}
@@ -1871,11 +1872,18 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
 =======
                 // Only Account specific Isolated network with sourceNat service disabled
are allowed in security group
                 // enabled zone
+=======
+                // Only Account specific Isolated network with sourceNat service disabled
are allowed in security group
+                // enabled zone
+>>>>>>> parent of d7201df... CLOUDSTACK-737
                 boolean allowCreation = (ntwkOff.getGuestType() == GuestType.Isolated 
                         && !_networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(),
Service.SourceNat));
                 if (!allowCreation) {
                     throw new InvalidParameterValueException("Only Account specific Isolated
network with sourceNat " +
                             "service disabled are allowed in security group enabled zone");
+<<<<<<< HEAD
+>>>>>>> parent of d7201df... CLOUDSTACK-737
+=======
 >>>>>>> parent of d7201df... CLOUDSTACK-737
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd67cfc5/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 82013d4..bd4f338 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -421,10 +421,15 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 		Hypervisor.HypervisorType hypervisorType = Hypervisor.HypervisorType
 				.getType(cmd.getHypervisor());
         if (hypervisorType == null) {
+<<<<<<< HEAD
 			s_logger.error("Unable to resolve " + cmd.getHypervisor()
 					+ " to a valid supported hypervisor type");
 			throw new InvalidParameterValueException("Unable to resolve "
 					+ cmd.getHypervisor() + " to a supported ");
+=======
+            s_logger.error("Unable to resolve " + cmd.getHypervisor() + " to a valid supported
hypervisor type");
+            throw new InvalidParameterValueException("Unable to resolve " + cmd.getHypervisor()
+ " to a supported ");
+>>>>>>> parent of d7201df... CLOUDSTACK-737
         }
 
         Cluster.ClusterType clusterType = null;


Mime
View raw message