You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/02/08 22:10:34 UTC
[34/43] git commit: refs/heads/ui-plugins - Revert "CLOUDSTACK-737"
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/447d49ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/447d49ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/447d49ae
Branch: refs/heads/ui-plugins
Commit: 447d49ae91277be2d8e60c28a5acd86a0e6691d5
Parents: dd67cfc
Author: Anthony Xu <an...@citrix.com>
Authored: Fri Feb 8 10:46:20 2013 -0800
Committer: Anthony Xu <an...@citrix.com>
Committed: Fri Feb 8 10:46:20 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 8 ++++++++
.../com/cloud/resource/ResourceManagerImpl.java | 3 +++
2 files changed, 11 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/447d49ae/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 19c1d9f..585251d 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1856,6 +1856,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
if (zone.isSecurityGroupEnabled()) {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
if (ipv6) {
throw new InvalidParameterValueException("IPv6 is not supported with security group!");
}
@@ -1876,12 +1877,19 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
// Only Account specific Isolated network with sourceNat service disabled are allowed in security group
// enabled zone
>>>>>>> parent of d7201df... CLOUDSTACK-737
+=======
+ // 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
+<<<<<<< HEAD
+>>>>>>> parent of d7201df... CLOUDSTACK-737
+=======
>>>>>>> parent of d7201df... CLOUDSTACK-737
=======
>>>>>>> parent of d7201df... CLOUDSTACK-737
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/447d49ae/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..43967e2 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -429,6 +429,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
=======
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 ");
+<<<<<<< HEAD
+>>>>>>> parent of d7201df... CLOUDSTACK-737
+=======
>>>>>>> parent of d7201df... CLOUDSTACK-737
}