On Mon, Oct 26, 2015 at 09:10:21AM +0000, 'Lisa Velden' via ganeti-devel wrote: > commit ab6fb63a9adafad7fb9f255f486bd749469f196e > Merge: 16c38b8 fc49406 > Author: Lisa Velden <[email protected]> > Date: Mon Oct 26 10:01:12 2015 +0100 > > Merge branch 'stable-2.15' into stable-2.16 > > * stable-2.15 > (no changes) > > * stable-2.14 > (no changes) > > * stable-2.13 > Renew-crypto: stop daemons on master node first > Mention manual creation of {shared,}file paths in UPGRADE > Don't warn about broken SSH setup of offline nodes > > * stable-2.12 > Fix inconsistency in python and haskell objects > Add notSerializeDefault default field option > Move design-disks.rst to drafts > > * stable-2.11 > Fix default for --default-iallocator-params > > Conflicts: > doc/design-draft.rst > > Resolution: > doc/design-draft.rst: take the stable-2.16 version and > add design-disks.rst > > Signed-off-by: Lisa Velden <[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
