You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/02/08 21:30:56 UTC
[2/3] git commit: refs/heads/master - Revert "Revert "CLOUDSTACK-737""
Revert "Revert "CLOUDSTACK-737""
This reverts commit dd67cfc5d07783cd4f8cf3480323f3ed030cc216.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c0f2cf1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c0f2cf1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c0f2cf1e
Branch: refs/heads/master
Commit: c0f2cf1e061563ffce62b42ad96cd1e377d865f1
Parents: b66f6c8
Author: anthony <an...@cloud.com>
Authored: Fri Feb 8 12:19:31 2013 -0800
Committer: anthony <an...@cloud.com>
Committed: Fri Feb 8 12:19:31 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 8 --------
.../com/cloud/resource/ResourceManagerImpl.java | 5 -----
2 files changed, 0 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c0f2cf1e/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 7a84e6e..42e0ef9 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1855,7 +1855,6 @@ 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!");
}
@@ -1872,18 +1871,11 @@ 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/c0f2cf1e/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 bd4f338..82013d4 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -421,15 +421,10 @@ 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;