[Geoserver-devel] Please hold off pulling or pushing from github (master, 2.3.x, 2.4.x)

GeoServer GeoServer Developer
1

I made a mess with a forced push and I’m sorting this out right now. Sorry for the inconvenience.

Rini

2

On Tue, Oct 21, 2014 at 9:11 AM, <Rini.Angreani@anonymised.com> wrote:

I made a mess with a forced push and I’m sorting this out right now.
Sorry for the inconvenience.

Hi,
I should have restored master to the last known point... could you check?

Cheers
Andrea

--

GeoServer Professional Services from the experts! Visit
http://goo.gl/NWWaa2 for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
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.

-------------------------------------------------------

3

Thanks Andrea. Looks alright now for master. I’ll be more careful next time.

Cheers

Rini

···

From: andrea.aime@…403… [mailto:andrea.aime@…403…] On Behalf Of Andrea Aime
Sent: Tuesday, 21 October 2014 3:45 PM
To: Angreani, Rini (Mineral Resources, Kensington)
Cc: Geoserver-devel
Subject: Re: [Geoserver-devel] Please hold off pulling or pushing from github (master, 2.3.x, 2.4.x)

On Tue, Oct 21, 2014 at 9:11 AM, <Rini.Angreani@…254…> wrote:

I made a mess with a forced push and I’m sorting this out right now. Sorry for the inconvenience.

Hi,

I should have restored master to the last known point… could you check?

Cheers

Andrea

–

==

GeoServer Professional Services from the experts! Visit

http://goo.gl/NWWaa2 for more information.

==

Ing. Andrea Aime

@geowolf

Technical Lead

GeoSolutions S.A.S.

Via Poggio alle Viti 1187

55054 Massarosa (LU)

Italy

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.

4

On 21/10/14 15:44, Andrea Aime wrote:

I should have restored master to the last known point... could you check?

That looks great, Andrea. I think Rini lost one merge from yesterday on master but she can recreate it.

2.4.x needs repair. Should be reset to this:
https://github.com/geoserver/geoserver/commit/848176cc0fc8e8d5f5b1deeb7e737ff12bfc902f
which is the parent of the 2.4.8 tag:
https://github.com/geoserver/geoserver/releases/tag/2.4.8
so the commit is easy to get.

2.3.x needs repair: Should be reset to this:
https://github.com/geoserver/geoserver/commit/5decce3f8ce42d484a0e7ad4b6715c10cf43e98d
which you may have since it was yours (pngj backport).
I do not know if anyone else has a clone of this.

Kind regards,

--
Ben Caradoc-Davies <Ben.Caradoc-Davies@anonymised.com>
Software Engineer
CSIRO Mineral Resources Flagship
Australian Resources Research Centre

5

I have restored 2.4.x and 2.3.x, with Ben's help.

Cheers
Rini

-----Original Message-----
From: Caradoc-Davies, Ben (Mineral Resources, Kensington)
Sent: Tuesday, 21 October 2014 4:03 PM
To: Andrea Aime; Angreani, Rini (Mineral Resources, Kensington)
Cc: Geoserver-devel
Subject: Re: [Geoserver-devel] Please hold off pulling or pushing from github (master, 2.3.x, 2.4.x)

On 21/10/14 15:44, Andrea Aime wrote:

I should have restored master to the last known point... could you check?

That looks great, Andrea. I think Rini lost one merge from yesterday on master but she can recreate it.

2.4.x needs repair. Should be reset to this:
https://github.com/geoserver/geoserver/commit/848176cc0fc8e8d5f5b1deeb7e737ff12bfc902f
which is the parent of the 2.4.8 tag:
https://github.com/geoserver/geoserver/releases/tag/2.4.8
so the commit is easy to get.

2.3.x needs repair: Should be reset to this:
https://github.com/geoserver/geoserver/commit/5decce3f8ce42d484a0e7ad4b6715c10cf43e98d
which you may have since it was yours (pngj backport).
I do not know if anyone else has a clone of this.

Kind regards,

--
Ben Caradoc-Davies <Ben.Caradoc-Davies@...254...> Software Engineer CSIRO Mineral Resources Flagship Australian Resources Research Centre

6

On Tue, Oct 21, 2014 at 10:03 AM, Ben Caradoc-Davies <
Ben.Caradoc-Davies@anonymised.com> wrote:

On 21/10/14 15:44, Andrea Aime wrote:

I should have restored master to the last known point... could you check?

That looks great, Andrea. I think Rini lost one merge from yesterday on
master but she can recreate it.

2.4.x needs repair. Should be reset to this:
https://github.com/geoserver/geoserver/commit/
848176cc0fc8e8d5f5b1deeb7e737ff12bfc902f
which is the parent of the 2.4.8 tag:
https://github.com/geoserver/geoserver/releases/tag/2.4.8
so the commit is easy to get.

2.3.x needs repair: Should be reset to this:
https://github.com/geoserver/geoserver/commit/
5decce3f8ce42d484a0e7ad4b6715c10cf43e98d
which you may have since it was yours (pngj backport).
I do not know if anyone else has a clone of this.

Luckily enough, I do. Recovered 2.4.x, it seems someone else already did
the same for 2.3.x

Cheers
Andrea

--

GeoServer Professional Services from the experts! Visit
http://goo.gl/NWWaa2 for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
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.

-------------------------------------------------------

7

On 21/10/14 16:14, Andrea Aime wrote:

    2.3.x needs repair: Should be reset to this:
    https://github.com/geoserver/__geoserver/commit/__5decce3f8ce42d484a0e7ad4b6715c__10cf43e98d
    <https://github.com/geoserver/geoserver/commit/5decce3f8ce42d484a0e7ad4b6715c10cf43e98d&gt;
    which you may have since it was yours (pngj backport).
    I do not know if anyone else has a clone of this.
Luckily enough, I do. Recovered 2.4.x, it seems someone else already did
the same for 2.3.x

Yep, Rini had the commit in her local repo. All sorted.

--
Ben Caradoc-Davies <Ben.Caradoc-Davies@anonymised.com>
Software Engineer
CSIRO Mineral Resources Flagship
Australian Resources Research Centre