We have now merged all changes from the docker-grouping-merge branch to the
master branch. Could not rebase due to the number of conflicts occurred,
therefore a merge was done.

Master branch now can be used for development. Please do a complete build
and run the tests.

Thanks

On Sun, Nov 9, 2014 at 11:58 PM, Imesh Gunaratne <im...@apache.org> wrote:

> It seems nearly impossible to rebase changes from docker-grouping-merge
> branch to the master.
>
> The docker-grouping-merge branch is nearly 650 commits ahead of the master
> and the rebase conflicts almost at each commit. We might need to go ahead
> with a merge.
>
> On Sun, Nov 9, 2014 at 10:38 PM, Chamila De Alwis <chami...@wso2.com>
> wrote:
>
>> It turned out it was an accessibility error. The events are now being
>> received by the agent and health stats are published to CEP. The app path
>> for PHP is not being properly set right now, so I'm looking into it now.
>>
>>
>> Regards,
>> Chamila de Alwis
>> Software Engineer | WSO2 | +94772207163
>> Blog: code.chamiladealwis.com
>>
>>
>>
>> On Sun, Nov 9, 2014 at 6:32 PM, Chamila De Alwis <chami...@wso2.com>
>> wrote:
>>
>>>
>>> On Sun, Nov 9, 2014 at 4:46 PM, Lahiru Sandaruwan <lahi...@wso2.com>
>>> wrote:
>>>
>>>> So this could be the Mqtt issue we saw earlier as well?
>>>
>>>
>>> I'm not sure. It might have been an accessibility issue. I'm in the
>>> process of verifying this now.
>>>
>>>
>>> Regards,
>>> Chamila de Alwis
>>> Software Engineer | WSO2 | +94772207163
>>> Blog: code.chamiladealwis.com
>>>
>>>
>>>
>>
>
>
> --
> Imesh Gunaratne
>
> Technical Lead, WSO2
> Committer & PMC Member, Apache Stratos
>



-- 
Imesh Gunaratne

Technical Lead, WSO2
Committer & PMC Member, Apache Stratos

Reply via email to