Return-Path: 
 <commits-return-38580-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3E4F010847
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed,  5 Mar 2014 05:20:47 +0000 (UTC)
Received: (qmail 93052 invoked by uid 500); 5 Mar 2014 05:20:46 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 92958 invoked by uid 500); 5 Mar 2014 05:20:45 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 92949 invoked by uid 99); 5 Mar 2014 05:20:44 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Mar 2014 05:20:44 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id DC77D9368E3; Wed,  5 Mar 2014 05:20:43 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mlsorensen@apache.org
To: commits@cloudstack.apache.org
Message-Id: <a7891e7f46e14ea7abf8951c5bd75208@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/4.3-forward to cd0d16f
Date: Wed,  5 Mar 2014 05:20:43 +0000 (UTC)

Repository: cloudstack
Updated Branches:
  refs/heads/4.3-forward 444e8f6bb -> cd0d16f05


CLOUDSTACK-6194: Failed to increase Shared network IP Range

Submitted-by:Saksham Srivastava <saksham.srivastava@citrix.com>


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

Branch: refs/heads/4.3-forward
Commit: cd0d16f05a2be02e3de1a327bba9a5acd112e4f2
Parents: 444e8f6
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Tue Mar 4 22:19:08 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Tue Mar 4 22:20:25 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd0d16f0/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index d2e5aaa..2e2c39f 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2666,7 +2666,7 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co
                 List<VlanVO> vlans = _vlanDao.listVlansByNetworkId(network.getId());
                 if (vlans != null && vlans.size() > 0) {
                     VlanVO vlan = vlans.get(0);
-                    if (vlanId == null) {
+                    if (vlanId == null || vlanId.contains(Vlan.UNTAGGED)) {
                         vlanId = vlan.getVlanTag();
                     } else if (!NetUtils.isSameIsolationId(vlan.getVlanTag(), vlanId)) {
                         throw new InvalidParameterValueException("there is already one vlan " + vlan.getVlanTag()