On Sunday, July 10, 2016, Akila Ravihansa Perera <raviha...@apache.org> wrote:
> Hi Imesh, > > Shall we first cherry-pick only bug fixes made to master branch and port > them to stratos-4.1.x? Then we can move everything from stratos-4.1.x to > master. I'll commit recent fixes made to master branch to stratos-4.1.x as > well. > +1 A good thought Akila! Thanks > > Thanks. > > On Sun, Jul 10, 2016 at 10:58 AM, Imesh Gunaratne <im...@apache.org > <javascript:_e(%7B%7D,'cvml','im...@apache.org');>> wrote: > >> Hi All, >> >> I tried to rebase 4.1.x branch to master branch, but there are conflicts >> in python cartridge agent. It looks like we have committed to both of these >> branches in parallel. >> >> Can someone assist me to resolve these conflicts? If not shall we discard >> what we have in master branch and take 4.1.x content into master branch? >> >> Thanks >> >> On Sun, Jul 3, 2016 at 11:31 PM, Imesh Gunaratne <im...@apache.org >> <javascript:_e(%7B%7D,'cvml','im...@apache.org');>> wrote: >> >>> Hi Devs, >>> >>> I just created a new version in JIRA [1] for this release. >>> Shall we please move issues which are already reported to this version >>> and create new issues for missing ones? >>> >>> [1] >>> https://issues.apache.org/jira/browse/STRATOS/fixforversion/12337845/ >>> >>> Thanks >>> >>> On Sun, Jul 3, 2016 at 7:12 PM, Imesh Gunaratne <im...@apache.org >>> <javascript:_e(%7B%7D,'cvml','im...@apache.org');>> wrote: >>> >>>> >>>> >>>> On Sunday, July 3, 2016, Lakmal Warusawithana <lak...@wso2.com >>>> <javascript:_e(%7B%7D,'cvml','lak...@wso2.com');>> wrote: >>>> >>>>> +1 Imesh, let's do a release >>>> >>>> >>>> Thanks Lakmal! Will prepare the release. >>>> >>>>> >>>>> On Sunday, July 3, 2016, Imesh Gunaratne <im...@apache.org> wrote: >>>>> >>>>>> Hi Devs, >>>>>> >>>>>> We did our last release on Dec 7th 2015 [1]. Since then we have done >>>>>> many bug fixes. Shall we release them now? >>>>>> >>>>>> [1] https://github.com/apache/stratos/releases >>>>>> [2] https://github.com/apache/stratos/commits/master >>>>>> >>>>>> Thanks >>>>>> >>>>>> -- >>>>>> Imesh Gunaratne >>>>>> >>>>>> Software Architect, WSO2 >>>>>> Committer & PMC Member, Apache Stratos >>>>>> >>>>> >>>>> >>>>> -- >>>>> Sent from Gmail Mobile >>>>> >>>> >>>> >>>> -- >>>> Imesh Gunaratne >>>> >>>> Software Architect, WSO2 >>>> Committer & PMC Member, Apache Stratos >>>> >>>> >>> >>> >>> -- >>> Imesh Gunaratne >>> >>> Software Architect, WSO2 >>> Committer & PMC Member, Apache Stratos >>> >> >> >> >> -- >> Imesh Gunaratne >> >> Software Architect, WSO2 >> Committer & PMC Member, Apache Stratos >> > > -- Imesh Gunaratne Software Architect, WSO2 Committer & PMC Member, Apache Stratos
