On Mon, Jun 29, 2015 at 04:34:25PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > commit b2b1a897c546fe7ea4efb29bf844bc2a5c9721ca > Merge: fce1b94 9fa8438 > Author: Petr Pudlak <[email protected]> > Date: Mon Jun 29 16:25:27 2015 +0200 > > Merge branch 'stable-2.12' into stable-2.13 > > * stable-2.12 > Update design doc with solution for Issue 1094 > Prevent multiple communication nics for one instance > Remove outdated reference to ganeti-masterd > Update ganeti-luxid man page > Add a man page for ganeti-wconfd > Make htools tolerate missing "dtotal" and "dfree" on luxi > Get QuickCheck 2.7 compatibility > TestCommon: Fix QuickCheck import warnings > Full QuickCheck 2.7 compatibility > Add a CPP macro for checking the version of QuickCheck > QuickCheck 2.7 compatibility > > * stable-2.11 > Downgrade log-message for rereading job > Dowgrade log-level for successful requests > > Conflicts: > test/hs/Test/Ganeti/TestCommon.hs > Resolution: > test/hs/Test/Ganeti/TestCommon.hs: keep additions from both > versions > > Signed-off-by: Petr Pudlak <[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
