Bharat - Can you please rebase and resend please ?

On 21/03/13 11:10 AM, "Nitin Mehta" <nitin.me...@citrix.com> wrote:

>Nitins-MacBook-Air:incubator-cloudstack nitinmehta$ git apply
>CS-14673.patch
>CS-14673.patch:19: trailing whitespace.
>
>CS-14673.patch:22: trailing whitespace.
>
>error: patch failed:
>server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java:109
>error: server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java: patch
>does not apply
>error: server/src/com/cloud/template/HyervisorTemplateAdapter.java: No
>such file or directory
>error: patch failed:
>server/src/com/cloud/template/TemplateManagerImpl.java:843
>error: server/src/com/cloud/template/TemplateManagerImpl.java: patch does
>not apply
>
>
>From: Animesh Chaturvedi
><animesh.chaturv...@citrix.com<mailto:animesh.chaturv...@citrix.com>>
>Reply-To: Animesh Chaturvedi
><animesh.chaturv...@citrix.com<mailto:animesh.chaturv...@citrix.com>>
>Date: Wednesday 20 March 2013 10:26 PM
>To: Nitin Mehta <nitin.me...@citrix.com<mailto:nitin.me...@citrix.com>>
>Cc: Animesh Chaturvedi
><animesh.chaturv...@citrix.com<mailto:animesh.chaturv...@citrix.com>>,
>Bharat Kumar <bharat.ku...@citrix.com<mailto:bharat.ku...@citrix.com>>,
>"cloudstack-...@incubator.apache.org<mailto:cloudstack-dev@incubator.apach
>e.org>" 
><cloudstack-...@incubator.apache.org<mailto:cloudstack-dev@incubator.apach
>e.org>>
>Subject: Re: Review Request: when a template is deleted and then copied
>over again , it is still marked as "Removed" in template_zone_ref table.
>
>This is an automatically generated e-mail. To reply, visit:
>https://reviews.apache.org/r/7018/
>
>
>On February 28th, 2013, 2:20 a.m., Nitin Mehta wrote:
>
>Ship It!
>
>Nitin please apply the patch
>
>
>- Animesh
>
>
>On January 13th, 2013, 5:14 p.m., bharat kumar wrote:
>
>Review request for cloudstack and Nitin Mehta.
>By bharat kumar.
>
>Updated Jan. 13, 2013, 5:14 p.m.
>
>Description
>
>This bug fix (CLOUDSTACK-970) deals with the database aspects of template
>creation, this changes the way in which the entries are added and removed
>from template_zone_ref and template_host_ref.
>
>
>
>
>Testing
>
>I have tested this on the asf branch.
>
>
>Diffs
>
>  *   server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java (2a0dfc8)
>  *   server/src/com/cloud/template/HyervisorTemplateAdapter.java
>(bdb89f6)
>  *   server/src/com/cloud/template/TemplateManagerImpl.java (1e87de2)
>
>View Diff<https://reviews.apache.org/r/7018/diff/>
>

Reply via email to