On Wed, Mar 25, 2015 at 03:57:13PM +0100, 'Hrvoje Ribicic' via ganeti-devel wrote: > commit 66b45663bcd9608090f38b17f7007b7076d3b9d7 > Merge: cdb253b 8512e31 > Author: Hrvoje Ribicic <[email protected]> > Date: Wed Mar 25 14:54:07 2015 +0000 > > Merge branch 'stable-2.12' into stable-2.13 > > * stable-2.12 > Revision bump to 2.12.2 > Update NEWS for 2.12.2 > > Conflicts: > NEWS > configure.ac > Resolution: > Use 2.13 version suffix, merge NEWS. > > Signed-off-by: Hrvoje Ribicic <[email protected]>
LGTM -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
