You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/29 19:21:06 UTC
[1/2] git commit: updated refs/heads/4.6 to fe0dc3f
Repository: cloudstack
Updated Branches:
refs/heads/4.6 a44e0b730 -> fe0dc3fac
CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0989855
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0989855
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0989855
Branch: refs/heads/4.6
Commit: d09898553e8a7722f82866367923bc8cedc62829
Parents: 3f7a86d
Author: Abhinandan Prateek <ab...@shapeblue.com>
Authored: Tue Nov 24 13:29:59 2015 +0530
Committer: Abhinandan Prateek <ab...@shapeblue.com>
Committed: Wed Nov 25 10:22:24 2015 +0530
----------------------------------------------------------------------
.../cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0989855/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index e60e346..a3ae526 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1949,7 +1949,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
} else {
// don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or
// shared network with same Vlan ID in the zone
- if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {
+ if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 ) {
throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId);
}
}
[2/2] git commit: updated refs/heads/4.6 to fe0dc3f
Posted by re...@apache.org.
Merge pull request #1116 from shapeblue/4.6-9064
CLOUDSTACK-9064: The users should be able to create multiple Guest Shhttps://issues.apache.org/jira/browse/CLOUDSTACK-9064
CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges.
* pr/1116:
CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges.
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe0dc3fa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe0dc3fa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe0dc3fa
Branch: refs/heads/4.6
Commit: fe0dc3fac71d4e0a7b0a6c7f42f1b0b25cb47133
Parents: a44e0b7 d098985
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Nov 29 19:20:43 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Nov 29 19:20:44 2015 +0100
----------------------------------------------------------------------
.../cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------