From dev-return-59568-apmail-cloudstack-dev-archive=cloudstack.apache.org@cloudstack.apache.org Tue Jun 17 11:41:36 2014 Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ADBC811254 for ; Tue, 17 Jun 2014 11:41:36 +0000 (UTC) Received: (qmail 34238 invoked by uid 500); 17 Jun 2014 11:41:36 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 34199 invoked by uid 500); 17 Jun 2014 11:41:36 -0000 Mailing-List: contact dev-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 dev@cloudstack.apache.org Received: (qmail 34188 invoked by uid 99); 17 Jun 2014 11:41:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 11:41:35 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of jayapalreddy.uradi@citrix.com designates 103.14.252.240 as permitted sender) Received: from [103.14.252.240] (HELO SMTP.CITRIX.COM.AU) (103.14.252.240) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 11:41:30 +0000 X-IronPort-AV: E=Sophos;i="5.01,493,1400025600"; d="scan'208";a="7290401" Received: from sinaccessns.citrite.net (HELO SINPEX01CL03.citrite.net) ([10.151.60.9]) by sinpip01.citrite.net with ESMTP; 17 Jun 2014 11:41:09 +0000 Received: from SINPEX01CL01.citrite.net ([169.254.1.37]) by SINPEX01CL03.citrite.net ([169.254.3.175]) with mapi id 14.03.0181.006; Tue, 17 Jun 2014 19:41:08 +0800 From: Jayapal Reddy Uradi To: Daan Hoogland CC: "dev@cloudstack.apache.org" Subject: Re: [ACS 4.4] cherry-pick Thread-Topic: [ACS 4.4] cherry-pick Thread-Index: AQHPifcflJWGTRrqCEWwDLT2BD9zQpt0ouaAgAAFGIA= Date: Tue, 17 Jun 2014 11:41:08 +0000 Message-ID: References: <5E5C8FE9-4BC2-4F59-981A-812B2FE049A3@citrix.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.13.107.79] Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-DLP: SIN1 X-Virus-Checked: Checked by ClamAV on apache.org Hi Daan, Resolved the conflicts and uploaded patch in review board. https://reviews.apache.org/r/22679/ Thanks, Jayapal On 17-Jun-2014, at 4:52 PM, Daan Hoogland wrote: > On Tue, Jun 17, 2014 at 8:41 AM, Jayapal Reddy Uradi > wrote: >> 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a >=20 >=20 > I had conflicts. Can you have a look near line 550? I resolved by > changing IpAddress to PublicIpAddress. >=20 > regards > --=20 > Daan