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 <[email protected]> Software Engineer CSIRO Mineral Resources Flagship Australian Resources Research Centre ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://p.sf.net/sfu/Zoho _______________________________________________ Geoserver-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geoserver-devel
