stratos-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Akila Ravihansa Perera <raviha...@wso2.com>
Subject Re: [Dev] Merge tenant-isolation branch to the master
Date Wed, 02 Sep 2015 03:45:46 GMT
Hi Gayan,

It seems some of the code has gone missing during the merge. Faced in an
issue in RuleTasksDelegator class in autoscaler component. I think we will
have to compare the two code bases and go through each differences to make
sure we have everything merged correctly.

Thanks.

On Tue, Sep 1, 2015 at 12:13 PM, Gayan Gunarathne <gayang@wso2.com> wrote:

> Now I have merged the tenant-isolation to the master branch with
> integration test. Now I am doing smoke test with the merge changes and will
> push the changes to the master branch today.
>
> Thanks,
> Gayan
>
> On Sun, Aug 30, 2015 at 11:47 PM, Akila Ravihansa Perera <
> ravihansa@wso2.com> wrote:
>
>> Hi Gayan,
>>
>> I've pushed all the fixes to master branch now. Please go ahead with
>> merging tenant isolation to master.
>>
>> Thanks.
>>
>> On Sun, Aug 30, 2015 at 11:11 PM, Gayan Gunarathne <gayang@wso2.com>
>> wrote:
>>
>>> Okay. Let me know once you have done.
>>>
>>> Thanks,
>>> Gayan
>>>
>>> On Sun, Aug 30, 2015 at 10:10 PM, Akila Ravihansa Perera <
>>> ravihansa@wso2.com> wrote:
>>>
>>>> Hi Gayan,
>>>>
>>>> Could you hold this off for few hours? I'm in the process of rebasing
>>>> all the fixes that were made to stratos-4.1.x branch to master branch.
>>>> Otherwise, we will have to go through all the commits one by one if
>>>> conflicts are found. wdyt?
>>>>
>>>> Thanks.
>>>>
>>>> On Sun, Aug 30, 2015 at 8:59 PM, Gayan Gunarathne <gayang@wso2.com>
>>>> wrote:
>>>>
>>>>>
>>>>> Hi All,
>>>>>
>>>>> I am in the process of merging the tenant-isolation branch to the
>>>>> master.So please refrain from committing the major changes to the master
>>>>> branch.
>>>>>
>>>>> Thanks,
>>>>> Gayan
>>>>>
>>>>>
>>>>> --
>>>>>
>>>>> Gayan Gunarathne
>>>>> Technical Lead, WSO2 Inc. (http://wso2.com)
>>>>> Committer & PMC Member, Apache Stratos
>>>>> email : gayang@wso2.com  | mobile : +94 775030545 <%2B94%20766819985>
>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Akila Ravihansa Perera
>>>> WSO2 Inc.;  http://wso2.com/
>>>>
>>>> Blog: http://ravihansa3000.blogspot.com
>>>>
>>>
>>>
>>>
>>> --
>>>
>>> Gayan Gunarathne
>>> Technical Lead, WSO2 Inc. (http://wso2.com)
>>> Committer & PMC Member, Apache Stratos
>>> email : gayang@wso2.com  | mobile : +94 775030545 <%2B94%20766819985>
>>>
>>>
>>>
>>
>>
>>
>> --
>> Akila Ravihansa Perera
>> WSO2 Inc.;  http://wso2.com/
>>
>> Blog: http://ravihansa3000.blogspot.com
>>
>
>
>
> --
>
> Gayan Gunarathne
> Technical Lead, WSO2 Inc. (http://wso2.com)
> Committer & PMC Member, Apache Stratos
> email : gayang@wso2.com  | mobile : +94 775030545 <%2B94%20766819985>
>
>
>



-- 
Akila Ravihansa Perera
WSO2 Inc.;  http://wso2.com/

Blog: http://ravihansa3000.blogspot.com

Mime
View raw message