On Wed, Nov 11, 2015 at 07:07:59PM +0100, 'Oleg Ponomarev' via ganeti-devel wrote: > commit 1b069691608602a77adfb612f30f7f1992180b36 > Merge: 95e1bd6 85e1c58 > Author: Oleg Ponomarev <[email protected]> > Date: Wed Nov 11 19:01:36 2015 +0100 > > Merge branch 'stable-2.13' into stable-2.14 > > * stable-2.13 > Extend timeout for gnt-cluster renew-crypto > > * 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 > > Conflicts: > tools/cfgupgrade > Resolution > take the change into lib/tools/cfgupgrade > > 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
