cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rajesh Battala <rajesh.batt...@citrix.com>
Subject RE: [ACS4.4] Cherry-pick
Date Wed, 18 Jun 2014 12:07:55 GMT
Hi Daan, 
This commit is based on the commit 
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commitdiff;h=b0d726a872e2859a56ee677c15079cc3a59ab894;hp=a5415d93eb791bac52c40b9ede6a433a0d7f1dca


this commit (b0d726a872e2859a56ee677c15079cc3a59ab894) is in 4.4-forward and not in 4.4 which
is committed by jaypal yesterday
when I have fixed my bug I have to rebase jaypal commit which is in 4.4-forward and build
is successfully. 

When you have cherry-picked my commit to 4.4, this commit(b0d726a872e2859a56ee677c15079cc3a59ab894)
is not cherry-picked. This commit is required as my changes are based on top of it. 

Please cherry-pick b0d726a872e2859a56ee677c15079cc3a59ab894 and then apply my commit on top
of it which will resolve the issue.


Thanks
Rajesh Battala

-----Original Message-----
From: Rajesh Battala [mailto:rajesh.battala@citrix.com] 
Sent: Wednesday, June 18, 2014 5:11 PM
To: dev@cloudstack.apache.org
Subject: RE: [ACS4.4] Cherry-pick

Am working on it. 

-----Original Message-----
From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
Sent: Wednesday, June 18, 2014 5:01 PM
To: dev
Subject: Re: [ACS4.4] Cherry-pick

[ERROR] COMPILATION ERROR :
[INFO] ------------------------------
-------------------------------
[ERROR] <http://jenkins.buildacloud.org/job/cloudstack-4.4-maven-build/ws/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java>:[174,7]
error: LoadBalancingRulesManagerImpl is not abstract and does not override abstract method
findLbByStickinessId(long) in LoadBalancingRulesService

I didn't run a test build :(

should I revert or do you have an implementation of the method laying around?

On Wed, Jun 18, 2014 at 1:22 PM, Daan Hoogland <daan.hoogland@gmail.com> wrote:
> On Wed, Jun 18, 2014 at 12:59 PM, Rajesh Battala 
> <rajesh.battala@citrix.com> wrote:
>> 21e452ff4f0459422f0612f2ddf7033a963b0a19
>
>
> there was a little conflict, which was easily resolved but please double check!
>
> --
> Daan



--
Daan
Mime
View raw message