Return-Path: 
 <commits-return-20942-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 A2FF4F36C
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Tue, 14 May 2013 00:51:17 +0000 (UTC)
Received: (qmail 77761 invoked by uid 500); 14 May 2013 00:42:27 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 77710 invoked by uid 500); 14 May 2013 00:42:27 -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 77141 invoked by uid 99); 14 May 2013 00:42:26 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 00:42:26 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 3EABD7B83; Tue, 14 May 2013 00:42:26 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ahuang@apache.org
To: commits@cloudstack.apache.org
Date: Tue, 14 May 2013 00:43:02 -0000
Message-Id: <3cffbea5f1ae4e7687bd6c9326fa7eec@git.apache.org>
In-Reply-To: <1e71aaf0cc8b4a4c8c176289a3e2940c@git.apache.org>
References: <1e71aaf0cc8b4a4c8c176289a3e2940c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [39/50] [abbrv] git commit: updated refs/heads/vmsync to d403974

VPC: When Netscaler is LB provider for the VPC, the VpcVirtualRouter can't provide LB services


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

Branch: refs/heads/vmsync
Commit: f12ac95a56983267fd66c215461fa7e17a43525f
Parents: 80dd9f2
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri May 10 11:03:34 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri May 10 11:18:30 2013 -0700

----------------------------------------------------------------------
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f12ac95a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 09776ae..e6d71fa 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -228,7 +228,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                 if (svc == Service.Lb) {
                     Set<Provider> lbProviders = new HashSet<Provider>();
                     lbProviders.add(Provider.Netscaler);
-                    lbProviders.add(Provider.VPCVirtualRouter);
+                    lbProviders.add(Provider.InternalLbVm);
                     svcProviderMap.put(svc, lbProviders);
                 } else {
                     svcProviderMap.put(svc, defaultProviders);