LGTM, thanks
On Wed, Jun 25, 2014 at 4:27 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > commit 03d8d365d14757bff92dc9e0e02be1f73c140c03 > Merge: 77feb12 543533a > Author: Klaus Aehlig <[email protected]> > Date: Wed Jun 25 16:24:13 2014 +0200 > > Merge branch 'stable-2.10' into stable-2.11 > > * stable-2.10 > Document --accept-existing-errors > Test hspace --accept-existing > hspace: support --accept-existing-errors > Add an option to accept existing N+1 violations > Document --independent-groups > Verify independence of allocation > Make hspace support --independent-groups > Add an option --independent-groups > Add a modifier for a group's allocation policy > hspace: optionally print allocatable nodes > Relax the tuple parsing restrictions > Fix typo in gnt-cluster modify help > Fix opcode result tuple validation > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc src/Ganeti/HTools/CLI.hs > index 6077d11,7a977e8..755eced > --- a/src/Ganeti/HTools/CLI.hs > +++ b/src/Ganeti/HTools/CLI.hs > @@@ -60,8 -59,10 +60,10 @@@ module Ganeti.HTools.CL > , oFullEvacuation > , oGroup > , oIAllocSrc > - , oIgnoreDyn > + , oIgnoreDyn > , oIgnoreNonRedundant > + , oIndependentGroups > + , oAcceptExisting > , oInstMoves > , oJobDelay > , genOLuxiSocket > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores >
