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 <[email protected]<mailto:[email protected]>>
>
> [ 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
