LGTM, thanks
On Tue, May 20, 2014 at 4:37 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > > commit b3ec10cefc8e7353aab09eaa61e40f0bc2fe0383 > Merge: a4aa6d0 c4460a4 > Author: Klaus Aehlig <[email protected]> > Date: Tue May 20 16:28:18 2014 +0200 > > Merge branch 'stable-2.10' into stable-2.11 > > * stable-2.10 > Add --no-locks option to gnt-debug delay > Include design-performance-tests.rst in index > Document the --force-failover option > Support group evacuation by failover > Add an option --force-failover > Extend OpGroupEvacuate by a ForceFailover paramter > Mark performance tests design as implemented > openvswitch fix > Document the --sequential option > Support sequential evacuation > Add an option --sequential > Extend OpGroupEvacuate by a sequential paramter > > * stable-2.9 > Improve haskell style > check-man-warnings: use C.UTF-8 and set LC_ALL > Fix passing of ispecs in cluster init during QA > > Conflicts: > doc/design-draft.rst > lib/cmdlib/group.py > src/Ganeti/JQueue.hs > All trivial. > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc doc/design-draft.rst > index 6c87b04,35f6c96..deeb924 > --- a/doc/design-draft.rst > +++ b/doc/design-draft.rst > @@@ -18,9 -19,6 +18,8 @@@ Design document draft > design-ceph-ganeti-support.rst > design-daemons.rst > design-hsqueeze.rst > + design-os.rst > + design-node-security.rst > - design-performance-tests.rst > > .. vim: set textwidth=72 : > .. Local Variables: > diff --cc doc/index.rst > index ab2cccf,5729625..fd34d9f > --- a/doc/index.rst > +++ b/doc/index.rst > @@@ -113,9 -108,9 +113,10 @@@ Draft design > design-oob.rst > design-openvswitch.rst > design-opportunistic-locking.rst > + design-os.rst > design-ovf-support.rst > design-partitioned > + design-performance-tests.rst > design-query2.rst > design-reason-trail.rst > design-restricted-commands.rst > diff --cc lib/cmdlib/group.py > index 20c5d30,3043b52..a70666c > --- a/lib/cmdlib/group.py > +++ b/lib/cmdlib/group.py > @@@ -28,9 -28,13 +28,10 @@@ from ganeti import constant > from ganeti import errors > from ganeti import locking > from ganeti import objects > + from ganeti import opcodes > -from ganeti import qlang > -from ganeti import query > from ganeti import utils > from ganeti.masterd import iallocator > -from ganeti.cmdlib.base import LogicalUnit, NoHooksLU, QueryBase, \ > - ResultWithJobs > +from ganeti.cmdlib.base import LogicalUnit, NoHooksLU, ResultWithJobs > from ganeti.cmdlib.common import MergeAndVerifyHvState, \ > MergeAndVerifyDiskState, GetWantedNodes, GetUpdatedParams, \ > CheckNodeGroupInstances, GetUpdatedIPolicy, \ > > -- > 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 >
