On Wed, Nov 11, 2015 at 06:30:52PM +0100, 'Oleg Ponomarev' via ganeti-devel wrote: > commit 0a204f1e2430956935a9bcd1eb9ab1dfdc02af8b > Merge: d0e19c6 9073c5f > Author: Oleg Ponomarev <[email protected]> > Date: Wed Nov 11 18:14:51 2015 +0100 > > Merge branch 'stable-2.12' into stable-2.13 > > * stable-2.12 > Revert "Also consider connection time out a network error" > Clone lists before modifying > Make lockConfig call retryable > > * stable-2.11 > (no changes) > > * stable-2.10 > Remove -X from hspace man page > Make htools tolerate missing "dtotal" and "dfree" on luxi > > Signed-off-by: Oleg Ponomarev <[email protected]> >
LGTM -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle
