LGTM On Tue, Oct 27, 2015 at 2:46 PM 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > > commit 3305e7ef799e6f2078409a4287c1f3e89a1a29d6 > Merge: 6069173 fa6fd0f > Author: Klaus Aehlig <[email protected]> > Date: Tue Oct 27 14:43:19 2015 +0100 > > Merge branch 'stable-2.17' into master > > * stable-2.17 > For snap, also honor the default IP family > Update NEWS file for 2.17 > Fix NEWS for 2.17 > Fix NEWS for 2.17 > Add doc/design-2.17.rst to the Makefile > Update documentation versions for stable-2.17 > Update implemented designs for stable-2.17 > > Conflicts: > doc/design-draft.rst (trivial) > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc doc/design-draft.rst > index 9d9954b,e7c47a3..e4c9f85 > --- a/doc/design-draft.rst > +++ b/doc/design-draft.rst > @@@ -24,12 -24,7 +24,8 @@@ Design document draft > design-network2.rst > design-configlock.rst > design-multi-storage-htools.rst > - design-repaird.rst > - design-migration-speed-hbal.rst > - design-memory-over-commitment.rst > design-macvtap.rst > - design-n-m-redundancy.rst > + design-global-hooks.rst > design-scsi-kvm.rst > design-disks.rst > > > > -- > 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
