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.child...@sungard.com] > Sent: Friday, March 22, 2013 8:53 PM > To: Pradeep Soundararajan > Cc: cloudstack-...@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 > > <t...@apache.org<mailto:t...@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 > > >
