Thanks Lakmal, we have now resolved compilation issues in the following
components:
- Autoscaler
- Cloud Controller
- CLI

The latest status of the merge process can be seen here:
https://issues.apache.org/jira/browse/STRATOS-924

The plan is to first resolve all compilation issues and then fix the
functional issues.

Thanks

On Thu, Oct 30, 2014 at 2:11 PM, Lakmal Warusawithana <lak...@wso2.com>
wrote:

> Great work Imesh! Please keep update the status.
>
> On Thu, Oct 30, 2014 at 1:52 PM, Imesh Gunaratne <im...@apache.org> wrote:
>
>> Hi,
>>
>> We merged changes from 4.0.0-grouping branch to docker-grouping-merge
>> branch using git merge tool and found around 50 conflicting files.
>> Afterwards those conflicts were resolved and committed.
>>
>> Now we are trying to compile the components and resolve compilation
>> issues:
>> - Found issues in messaging component and resolved
>> - Currently working on Autoscaler where there are changes in monitor
>> classes which have been changed in both branches.
>>
>> Thanks
>>
>> On Wed, Oct 29, 2014 at 10:30 PM, Lakmal Warusawithana <lak...@wso2.com>
>> wrote:
>>
>>> Yes, targeting GA end of nov.
>>>
>>>
>>> On Wed, Oct 29, 2014 at 10:27 PM, Martin Eppel (meppel) <
>>> mep...@cisco.com> wrote:
>>>
>>>>  So target date of GA would be and of November (as was planned for
>>>> 4.2), or might this be moved (to when) ?
>>>>
>>>>
>>>>
>>>> *From:* Lakmal Warusawithana [mailto:lak...@wso2.com]
>>>> *Sent:* Wednesday, October 29, 2014 9:45 AM
>>>>
>>>> *To:* dev@stratos.apache.org
>>>> *Subject:* Re: [Important] Merging Grouping Changes to Master Branch
>>>>
>>>>
>>>>
>>>> Yes
>>>>
>>>>
>>>>
>>>> On Wed, Oct 29, 2014 at 10:10 PM, Martin Eppel (meppel) <
>>>> mep...@cisco.com> wrote:
>>>>
>>>> So this will move out the 4.1 release to what was planned for 4.2,
>>>> correct ?
>>>>
>>>>
>>>>
>>>> *From:* Lakmal Warusawithana [mailto:lak...@wso2.com]
>>>> *Sent:* Wednesday, October 29, 2014 9:29 AM
>>>> *To:* dev@stratos.apache.org
>>>> *Subject:* Re: [Important] Merging Grouping Changes to Master Branch
>>>>
>>>>
>>>>
>>>> Hi Martin,
>>>>
>>>>
>>>>
>>>> Initially we thought of doing two releases for docker and grouping, but
>>>> due to time constrain we are going to do a single release which carry both
>>>> grouping and docker in one release which is 4.1.0.
>>>>
>>>>
>>>>
>>>> On Wed, Oct 29, 2014 at 9:37 PM, Martin Eppel (meppel) <
>>>> mep...@cisco.com> wrote:
>>>>
>>>> Hi Imesh,
>>>>
>>>>
>>>>
>>>> Since we are merging the 4.0.0-grouping branch into the master are
>>>> these changes (grouping) also going into 4.1 ?
>>>>
>>>>
>>>>
>>>> Thanks
>>>>
>>>>
>>>>
>>>> Martin
>>>>
>>>>
>>>>
>>>> *From:* Imesh Gunaratne [mailto:im...@apache.org]
>>>> *Sent:* Wednesday, October 29, 2014 6:33 AM
>>>> *To:* dev
>>>> *Subject:* [Important] Merging Grouping Changes to Master Branch
>>>>
>>>>
>>>>
>>>> Hi Devs,
>>>>
>>>>
>>>>
>>>> We are now in the process of merging service grouping changes
>>>> (4.0.0-grouping branch) into master branch.
>>>>
>>>>
>>>>
>>>> We have created a new branch: *docker-grouping-merge* for this process
>>>> from the latest commit in the master branch and merging changes from
>>>> *4.0.0-grouping* branch to it.
>>>>
>>>>
>>>>
>>>> Please try to hold your commits to master branch until we complete this
>>>> process. If not please double commit your changes to master and
>>>> docker-grouping-merge branches.
>>>>
>>>>
>>>>
>>>> Thanks
>>>>
>>>>
>>>>
>>>>
>>>> --
>>>>
>>>> Imesh Gunaratne
>>>>
>>>>
>>>>
>>>> Technical Lead, WSO2
>>>>
>>>> Committer & PMC Member, Apache Stratos
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> --
>>>>
>>>> Lakmal Warusawithana
>>>>
>>>> Vice President, Apache Stratos
>>>>
>>>> Director - Cloud Architecture; WSO2 Inc.
>>>>
>>>> Mobile : +94714289692
>>>>
>>>> Blog : http://lakmalsview.blogspot.com/
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> --
>>>>
>>>> Lakmal Warusawithana
>>>>
>>>> Vice President, Apache Stratos
>>>>
>>>> Director - Cloud Architecture; WSO2 Inc.
>>>>
>>>> Mobile : +94714289692
>>>>
>>>> Blog : http://lakmalsview.blogspot.com/
>>>>
>>>
>>>
>>>
>>> --
>>> Lakmal Warusawithana
>>> Vice President, Apache Stratos
>>> Director - Cloud Architecture; WSO2 Inc.
>>> Mobile : +94714289692
>>> Blog : http://lakmalsview.blogspot.com/
>>>
>>>
>>
>>
>> --
>> Imesh Gunaratne
>>
>> Technical Lead, WSO2
>> Committer & PMC Member, Apache Stratos
>>
>
>
>
> --
> Lakmal Warusawithana
> Vice President, Apache Stratos
> Director - Cloud Architecture; WSO2 Inc.
> Mobile : +94714289692
> Blog : http://lakmalsview.blogspot.com/
>
>


-- 
Imesh Gunaratne

Technical Lead, WSO2
Committer & PMC Member, Apache Stratos

Reply via email to