LGTM On Fri, Oct 23, 2015 at 1:35 PM 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > > commit b180c45a831b50218978226ba99f9c517bd7a449 > Merge: 32cb9b9 4c4a26d > Author: Klaus Aehlig <[email protected]> > Date: Fri Oct 23 13:32:06 2015 +0200 > > Merge branch 'stable-2.14' into stable-2.15 > > * 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: > take all additions > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc doc/design-draft.rst > index f56c3f7,7aab851..09cf2ba > --- a/doc/design-draft.rst > +++ b/doc/design-draft.rst > @@@ -24,8 -24,7 +24,9 @@@ Design document draft > design-sync-rate-throttling.rst > design-network2.rst > design-configlock.rst > + design-multi-storage-htools.rst > + design-shared-storage-redundancy.rst > + design-disks.rst > > .. vim: set textwidth=72 : > .. Local Variables: > > > -- > 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 > -- Lisa Velden Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
