Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: neutral (nike.apache.org: local policy)
Date: Mon, 25 Mar 2013 13:33:55 -0400
From: Chip Childers <chip.childers@sungard.com>
To: Pradeep Soundararajan <pradeep.soundararajan@citrix.com>
Cc: "cloudstack-dev@incubator.apache.org"
 <cloudstack-dev@incubator.apache.org>,
	Wido den Hollander <wido@widodh.nl>,
	Prasanna Santhanam <Prasanna.Santhanam@citrix.com>,
	Hugo Trippaers <htrippaers@schubergphilis.com>
Subject: Re: [ACS41][PatchRequest] CLOUDSTACK-1252: Failed to download
 default template in VMware
Message-ID: <20130325173355.GN53904@USLT-205755.sungardas.corp>
References: <44B61608130E8C44ABA956373E8251DD0228DA@SINPEX01CL03.citrite.net>
 <20130322152328.GV53904@USLT-205755.sungardas.corp>
 <44B61608130E8C44ABA956373E8251DD024674@SINPEX01CL03.citrite.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <44B61608130E8C44ABA956373E8251DD024674@SINPEX01CL03.citrite.net>
User-Agent: Mutt/1.5.21 (2010-09-15)

On Mon, Mar 25, 2013 at 02:45:04PM +0000, Pradeep Soundararajan wrote:
> Chip,
> 
> I have reopened the one for you in 4.1.
> 
> https://reviews.apache.org/r/9900/
> 
> This applies well in 4.1. Let me know if you still see any issue.

Applied.  Thanks!

> 
> Thanks,
> Pradeep S
> 
> 
> -----Original Message-----
> From: Chip Childers [mailto:chip.childers@sungard.com] 
> Sent: Friday, March 22, 2013 8:53 PM
> To: Pradeep Soundararajan
> Cc: cloudstack-dev@incubator.apache.org; Wido den Hollander; Prasanna Santhanam; Hugo Trippaers
> Subject: Re: [ACS41][PatchRequest] CLOUDSTACK-1252: Failed to download default template in VMware
> 
> On Fri, Mar 22, 2013 at 11:40:04AM +0000, Pradeep Soundararajan wrote:
> > Could you please add this in 4.1?
> > 
> > 
> > Commit 01ea7232d9a7e956277f03c8471d8d4e2b60d699 in branch 
> > refs/heads/master from Prasanna Santhanam 
> > <tsp@apache.org<mailto:tsp@apache.org>>
> > 
> > [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=01ea723 ]
> > 
> > 
> > 
> > CLOUDSTACK-1252: Failed to download default template in VMware
> > 
> > 
> > 
> > Proposing to modify package.sh script. Package as per OSS or NONOSS arguments.
> > 
> > Thanks,
> > Pradeep S
> >
> 
> Cherry-pick has conflicts.  Please provide a clean patch to work with.
> 
> Conflict is in cloud.spec as below:
> 
> <<<<<<< HEAD
> mvn -P awsapi package -Dsystemvm
> =======
> 
> if [ "%{_ossnoss}" == "NONOSS" -o "%{_ossnoss}" == "nonoss" ] ; then
>     echo "Packaging nonoss components"
>    mvn -Pawsapi,systemvm -Dnonoss package else
>     echo "Packaging oss components"
>    mvn -Pawsapi package -Dsystemvm
> fi
> >>>>>>> 01ea723... CLOUDSTACK-1252: Failed to download default template 
> >>>>>>> in VMware
> 
> 
>