Return-Path: 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 2274310D2A for ; Sun, 5 May 2013 07:59:39 +0000 (UTC) Received: (qmail 41529 invoked by uid 500); 5 May 2013 07:59:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 40831 invoked by uid 500); 5 May 2013 07:59:29 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 39435 invoked by uid 99); 5 May 2013 07:59: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; Sun, 05 May 2013 07:59:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3644B88710C; Sun, 5 May 2013 07:59:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prachidamle@apache.org To: commits@cloudstack.apache.org Date: Sun, 05 May 2013 07:59:55 -0000 Message-Id: In-Reply-To: <45921b2028c044ad8ac620eb6a6d3425@git.apache.org> References: <45921b2028c044ad8ac620eb6a6d3425@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] git commit: updated refs/heads/planner_reserve to 9b86516 fixes bug which was storing NetScale site public IP as site private IP Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ae48197 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ae48197 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ae48197 Branch: refs/heads/planner_reserve Commit: 3ae481973281e4ba73f6791f067f7b6ffe9efc3b Parents: 0680fbd Author: Murali Reddy Authored: Fri May 3 12:36:02 2013 +0530 Committer: Murali Reddy Committed: Fri May 3 12:36:02 2013 +0530 ---------------------------------------------------------------------- .../ExternalLoadBalancerDeviceManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ae48197/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java index b4662d1..686f5bc 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java @@ -270,7 +270,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase lbDeviceVO = new ExternalLoadBalancerDeviceVO(host.getId(), pNetwork.getId(), ntwkDevice.getNetworkServiceProvder(), deviceName, capacity, dedicatedUse, gslbProvider); if (gslbProvider) { - lbDeviceVO.setGslbSitePrivateIP(gslbSitePublicIp); + lbDeviceVO.setGslbSitePublicIP(gslbSitePublicIp); lbDeviceVO.setGslbSitePrivateIP(gslbSitePrivateIp); } _externalLoadBalancerDeviceDao.persist(lbDeviceVO);