On Thu, Feb 12, 2015 at 01:54:01PM +0100, 'Petr Pudlak' via ganeti-devel wrote: > commit 8300eb0f27c66d737ac7a2cb9f5af1ece0f8a813 > Merge: 69c4681 8b24ee6 > Author: Petr Pudlak <[email protected]> > Date: Thu Feb 12 13:47:47 2015 +0100 > > Merge branch 'stable-2.13' into stable-2.14 > > * stable-2.13 > Make ganeti-mond honor /etc/services > Document that hsqueeze was finished in 2.13 > > * stable-2.12 > Construct lenses correctly for different 'lens' versions > Create a simple CPP macro for detecting lens versions > Allow LVM output parsing to work for thin volumes > > * stable-2.11 > (no changes) > > * stable-2.10 > Also distribute devel/build_chroot > Update ganeti download location > Fix haddock comment > > Conflicts: > Makefile.am - keep 2.14 version, remove all changes from [cfd9c8a825]
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
