cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sanjeev Neelarapu <sanjeev.neelar...@citrix.com>
Subject RE: Review Request: CLOUDSTACK-702: Tests for Multiple IP Ranges
Date Mon, 06 May 2013 08:52:54 GMT
Prasanna,

This request has two patches: revision1 and revision2
In my local branch(which is up-to-date with master) I applied revision1 first and then revision2.

I think you are trying to apply revision2 which has only differences from revision1.
Can you try applying revision1 first and 2 later?

Thanks,
Sanjeev


-----Original Message-----
From: Prasanna Santhanam [mailto:noreply@reviews.apache.org] On Behalf Of Prasanna Santhanam
Sent: Monday, May 06, 2013 12:19 PM
To: Prasanna Santhanam; Srikanteswararao Talluri
Cc: cloudstack; Sanjeev Neelarapu
Subject: Re: Review Request: CLOUDSTACK-702: Tests for Multiple IP Ranges


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/10861/#review20178
-----------------------------------------------------------


This looks fine but I'm unable to apply your patch onto master. Can you resubmit please? Thanks

~/workspace/cloudstack/incubator-cloudstack(branch:master) ยป git am -s patch/0001-CLOUDSTACK-702-Test-for-Multiple-IP-Ranges-R3.patch
                       tsp@cloud-2
Applying: CLOUDSTACK-702: Test for Multiple IP Ranges-R3 1.Add non-contiguous guest IP range
in new CIDR 2.Add overlapped guest IP range in existing CIDR
fatal: corrupt patch at line 187
Patch failed at 0001 CLOUDSTACK-702: Test for Multiple IP Ranges-R3 1.Add non-contiguous guest
IP range in new CIDR 2.Add overlapped guest IP range in existing CIDR When you have resolved
this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


- Prasanna Santhanam


On May 2, 2013, 12:04 p.m., sanjeev n wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/10861/
> -----------------------------------------------------------
> 
> (Updated May 2, 2013, 12:04 p.m.)
> 
> 
> Review request for cloudstack, Prasanna Santhanam and SrikanteswaraRao Talluri.
> 
> 
> Description
> -------
> 
> CLOUDSTACK-702: Tests for Multiple IP Ranges
> 
> 1. Deleting IP Range from the existing CIDR.
> 
> 
> This addresses bug CLOUDSTACK-702.
> 
> 
> Diffs
> -----
> 
>   test/integration/component/test_multiple_ip_ranges.py 489e7ca
> 
> Diff: https://reviews.apache.org/r/10861/diff/
> 
> 
> Testing
> -------
> 
> Tested with fixed IP addresses since code has not been implemented(To make sure no syntax
errors).
> 
> 
> Thanks,
> 
> sanjeev n
> 
>

Mime
View raw message