Hi Justin,
I remember that, it happened after another forced push... and thought we
protected all branches from
forced pushes?
I guess that this actually needs to be done manually for each newly created
branch eh?
Cheers
Andrea
On Sat, Oct 28, 2017 at 5:08 AM, Justin Deoliveira <jdeol...@gmail.com>
wrote:
> I am sure folks are aware but GitHub supports “protected branches” that
> outright disable force pushes. Extremely useful feature :) Looking in
> github it looks like it was used in the past: master, and branches 2.5.x -
> 2.8.x are protected but no others are. Probably a useful thing to add to
> the process when creating a new maintenance branch would be to go into
> GitHub and add that branch as a protected one. It looks like it is possible
> to do it via the GitHub api as well, so also possible to add to the release
> scripts as well.
>
> $0.02
>
> On October 27, 2017 at 7:18:38 PM, Ben Caradoc-Davies (b...@transient.nz)
> wrote:
>
> Merged.
>
> On 28/10/17 13:55, Ben Caradoc-Davies wrote:
> > I have submitted a pull request:
> > https://github.com/geoserver/geoserver/pull/2613
> >
> > This pull request contains:
> >
> > - The six substantive commits on my local 2.12.x branch (listed earlier)
> >
> > - Cherry-picked from master (I *assume* this was a straightforward
> > cherry-pick to backport to 2.12.x):
> > 9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML
> > validates without being online.
> >
> > I did *not* include:
> >
> > Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
> > [GEOS-8360] xStream security warning
> >
> > because I think it has already been cherry-picked onto the new 2.12.x as
> > https://github.com/geoserver/geoserver/pull/2613.
> >
> > This leaves only the changes listed in this Jenkins build:
> > https://build.geoserver.org/view/geoserver/job/geoserver-
> 2.12.x/37/changes
> >
> > Alessio, I do not know if you intended to remove these changes. Please
> > re-apply them to 2.12.x if that was your intent.
> >
> > Kind regards,
> >
>
> --
> Ben Caradoc-Davies <b...@transient.nz>
> Director
> Transient Software Limited <http://transient.nz/>
> New Zealand
>
> ------------------------------------------------------------------------------
>
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Geoserver-devel mailing list
> Geoserver-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/geoserver-devel
>
>
--
Regards,
Andrea Aime
==
GeoServer Professional Services from the experts! Visit http://goo.gl/it488V
for more information.
==
Ing. Andrea Aime
@geowolf
Technical Lead
GeoSolutions S.A.S.
Via di Montramito 3/A
55054 Massarosa (LU)
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549
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.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
