LGTM On Mon, Oct 26, 2015 at 1:37 PM 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > > commit 55d8d2952ae44e98f7a1c4e8e76075e814e1a825 > Merge: 6e13b9b 4aef27f > Author: Klaus Aehlig <[email protected]> > Date: Mon Oct 26 13:11:46 2015 +0100 > > Merge branch 'stable-2.16' into stable-2.17 > > * 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 > src/Ganeti/HTools/Loader.hs > src/Ganeti/Objects.hs > Resolution: > src/Ganeti/Objects.hs: ignore double-addition > due to cherry picks > rest: take all additions > > diff --cc Makefile.am > index b7fcfe8,792527e..12718dc > --- a/Makefile.am > +++ b/Makefile.am > @@@ -1724,11 -1696,9 +1725,12 @@@ TEST_FILES = > test/autotools/autotools-check-news.test \ > test/data/htools/clean-nonzero-score.data \ > test/data/htools/common-suffix.data \ > + test/data/htools/dyn1.json \ > + test/data/htools/dyn2.json \ > + test/data/htools/dyn3.json \ > test/data/htools/empty-cluster.data \ > test/data/htools/hail-alloc-dedicated-1.json \ > + test/data/htools/hail-alloc-desired-location.json \ > test/data/htools/hail-alloc-drbd.json \ > test/data/htools/hail-alloc-drbd-restricted.json \ > test/data/htools/hail-alloc-ext.json \ > diff --cc doc/design-draft.rst > index 49e7ab9,b2ce6a2..4ce3418 > --- a/doc/design-draft.rst > +++ b/doc/design-draft.rst > @@@ -25,10 -25,8 +25,12 @@@ Design document draft > 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-scsi-kvm.rst > + design-disks.rst > > .. vim: set textwidth=72 : > .. Local Variables: > diff --cc src/Ganeti/HTools/Loader.hs > index 6f396ab,50ffbc1..2294468 > --- a/src/Ganeti/HTools/Loader.hs > +++ b/src/Ganeti/HTools/Loader.hs > @@@ -53,7 -53,8 +53,9 @@@ module Ganeti.HTools.Loade > , ClusterData(..) > , isAllocationRequest > , emptyCluster > + , obtainNodeMemory > + , extractDesiredLocations > + , updateDesiredLocationTags > ) where > > import Control.Monad > > -- > 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
