Return-Path: 
 <commits-return-38657-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 F079310EC2
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu,  6 Mar 2014 18:09:46 +0000 (UTC)
Received: (qmail 44781 invoked by uid 500); 6 Mar 2014 18:09:42 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 44593 invoked by uid 500); 6 Mar 2014 18:09:39 -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 42551 invoked by uid 99); 6 Mar 2014 18:09:27 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 18:09:27 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 0FBAE93968C; Thu,  6 Mar 2014 18:09:27 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tuna@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 06 Mar 2014 18:09:28 -0000
Message-Id: <506550debf5c44d498ebd5f88e067832@git.apache.org>
In-Reply-To: <663544ce06a14b1890fe0a50f1b7c24c@git.apache.org>
References: <663544ce06a14b1890fe0a50f1b7c24c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/7] git commit: updated refs/heads/4.3-forward to 8fdf941

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/135247af
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/135247af
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/135247af

Branch: refs/heads/4.3-forward
Commit: 135247afd114c1dfc6dde22184430237e79aafc5
Parents: eb61f81
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Tue Mar 4 22:19:08 2014 -0700
Committer: ng.tuna@gmail.com <apple@Tuna.local>
Committed: Fri Mar 7 01:08:00 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/135247af/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()