[GeoNode-devel] geonode 2.7.x vs master branch

[Angelos Tzotsos]

s/2.7.4/2.7.x/g
:)

On 05/12/2017 01:17 PM, Angelos Tzotsos wrote:
> Hi all,
>
> Actually, as Simone noted, the unstable releases (2.5.x) happened from 
> master in the past, and I agree that this should keep happening.
> Since the pubsub stuff is now fixed, what is holding us from having 
> 2.7.x merged back to master and deleted? The notification work? If 
> yes, I propose we rename current master to notification_branch (since 
> it is already linearly behind 2.7.4) and rename 2.7.x to master until 
> the new notification system can be optional.
>
> Thoughts?
> Angelos
>
> On 05/12/2017 10:59 AM, Alessio Fabiani wrote:
>> Hi Simone,
>> yes I'm monitoring the situation. Currently I'm trying to keep master 
>> and
>> 2.7.x aligned as much as possible.
>>
>> Now that the PUBSUB stuff has been fixed, after having tested it, my
>> propose is to return to normal situation.
>>
>> Unless other comments I would proceed like this:
>>
>> 1. Forward port 2.7.x improvements to master branch (now working)
>> 2. Let the 2.7.x become an aligned branch of master
>> 3. Move master to 2.8.x
>>
>>
>> Best Regards,
>> Alessio Fabiani.
>>
>> ==
>> GeoServer Professional Services from the experts!
>> Visit http://goo.gl/it488V for more information.
>> ==
>>
>> Ing. Alessio Fabiani
>> @alfa7691
>> github <https://github.com/afabiani?tab=overview>
>> Founder/Technical Lead
>>
>> GeoSolutions S.A.S.
>> Via di Montramito 3/A
>> 55054  Massarosa (LU)
>> Italy
>> phone: +39 0584 962313
>> fax:     +39 0584 1660272
>> mob:   +39 331 6233686
>>
>> http://www.geo-solutions.it
>> http://twitter.com/geosolutions_it
>>
>> -------------------------------------------------------
>>
>> *AVVERTENZE AI SENSI DEL D.Lgs. 196/2003*
>>
>> Le informazioni contenute in questo messaggio di posta elettronica e/o
>> nel/i file/s allegato/i sono da considerarsi strettamente riservate. Il
>> loro utilizzo è consentito esclusivamente al destinatario del messaggio,
>> per le finalità indicate nel messaggio stesso. Qualora riceviate questo
>> messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
>> darcene notizia via e-mail e di procedere alla distruzione del messaggio
>> stesso, cancellandolo dal Vostro sistema. Conservare il messaggio 
>> stesso,
>> divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od
>> utilizzarlo per finalità diverse, costituisce comportamento contrario ai
>> principi dettati dal D.Lgs. 196/2003.
>>
>>
>>
>> The information in this message and/or attachments, is intended 
>> solely for
>> the attention and use of the named addressee(s) and may be 
>> confidential or
>> proprietary in nature or covered by the provisions of privacy act
>> (Legislative Decree June, 30 2003, no.196 - Italy's New Data Protection
>> Code).Any use not in accord with its purpose, any disclosure, 
>> reproduction,
>> copying, distribution, or either dissemination, either whole or 
>> partial, is
>> strictly forbidden except previous formal approval of the named
>> addressee(s). If you are not the intended recipient, please contact
>> immediately the sender by telephone, fax or e-mail and delete the
>> information in this message that has been received in error. The sender
>> does not give any warranty or accept liability as the content, 
>> accuracy or
>> completeness of sent messages and accepts no responsibility  for changes
>> made after they were sent or for other risks which arise as a result of
>> e-mail transmission, viruses, etc.
>>
>> ---------------------------------------------------------------------
>>
>> On Fri, May 12, 2017 at 9:49 AM, Simone Dalmasso 
>> <simone.dalmasso at gmail.com>
>> wrote:
>>
>>> Dears,
>>>
>>> I noticed a lot of great contributions going on the repo lately, 
>>> this is
>>> great. I noticed that some of them are addressed to master and some 
>>> on the
>>> 2.7.x branch.
>>>
>>> We used to use the numbered branches to freeze master just before the
>>> release and do there only small fixes but most of the development is 
>>> always
>>> been on master.
>>>
>>> I think we could end up in a very difficult to manage situation if we
>>> split the commits between 2 as they will be soon very misaligned.
>>>
>>> This is just a reminder :) before things get messy. There are for sure
>>> reasons why lots of stuff is going to 2.7.x but just let's keep in 
>>> mind to
>>> keep 2.7.x and master aligned. Same applies to the small fixes on 2.6.x
>>> that have to be ported on master, but that is easy.
>>>
>>> Ciao!
>>>
>>>
>>> -- 
>>> Simone
>>>
>>> _______________________________________________
>>> geonode-devel mailing list
>>> geonode-devel at lists.osgeo.org
>>> https://lists.osgeo.org/mailman/listinfo/geonode-devel
>>>
>>>
>>
>>
>> _______________________________________________
>> geonode-devel mailing list
>> geonode-devel at lists.osgeo.org
>> https://lists.osgeo.org/mailman/listinfo/geonode-devel
>
>

-- 
Angelos Tzotsos, PhD
Charter Member
Open Source Geospatial Foundation
http://users.ntua.gr/tzotsos