LGTM On Mon, Oct 26, 2015 at 2:53 PM 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > > commit bb0b2f9d95b7a8b1b08bc6bfd98d48199cbd1679 > Merge: 8d36a13 9bfbe75 > Author: Klaus Aehlig <[email protected]> > Date: Mon Oct 26 14:46:08 2015 +0100 > > Merge branch 'stable-2.17' into master > > * stable-2.17 > Increase the weight of the memory balance > Add a test for --mem-weight > Make hbal support --mem-weight > In MaintD take memory load into account > Export useInstanceRSSData > Add an option to scale memory weight > Support scaling of the memory weight > Add a test for memory-based balancing > Make hbal support --mond-kvm-rss > Also support the kvm RSS collector at MonD backend > Add an new option --mond-kvm-rss > Add tests for handling of dynamic utilisation > Make hbal support --idle-default > Make Extloader honor optIdleDefault > Add a new option for assuming idleness > > * stable-2.16 > kvm: Introduce kvm_pci_reservations hvparam > kvm: Introduce scsi_controller_type hvparam > kvm: Use the new interface during hotplug actions > kvm: Work around QEMU commit 48f364dd > monitor: Use hvinfo in QMP methods > kvm: Refactor device option handling > Add design doc for SCSI support in KVM > Add test for desired locations accounting in ialloc > Fix requested instance desired location tags in IAllocator > > * 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: trivial > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc doc/design-draft.rst > index 180bee8,4ce3418..9d9954b > --- a/doc/design-draft.rst > +++ b/doc/design-draft.rst > @@@ -29,7 -29,8 +29,9 @@@ Design document draft > design-memory-over-commitment.rst > design-macvtap.rst > design-n-m-redundancy.rst > + design-global-hooks.rst > + design-scsi-kvm.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
