On Fri, Mar 28, 2014 at 10:25 AM, Klaus Aehlig <[email protected]> wrote: > On Fri, Mar 28, 2014 at 10:23:16AM +0100, Klaus Aehlig wrote: > > Sorry, that mail was incomplete > > > commit 8da30189f38188bad78f8cbaad8e7b903ba84796 > Merge: c026664 e69c93f > Author: Klaus Aehlig <[email protected]> > Date: Fri Mar 28 10:15:06 2014 +0100 > > Merge branch 'stable-2.11' into master > > * stable-2.11 > (no changes) > > * stable-2.10 > Fix specification of TIDiskParams > Add unittests for instance modify parameter renaming > Add renaming of instance custom params > Add RAPI symmetry tests for groups > Extend RAPI symmetry tests with RAPI-only aliases > Add test for group custom parameter renaming > Add renaming of group custom ndparams, ipolicy, diskparams > Add the RAPI symmetry test for nodes > Add aliases for nodes > Allow choice of HTTP method for modification > Add cluster RAPI symmetry test > Fix failing cluster query test > Add aliases for cluster parameters > Add support for value aliases to RAPI > Provide tests for GET/PUT symmetry > Sort imports > Also consider filter fields for deciding if using live data > Document the python-fdsend dependency > > * stable-2.9 > Fix failing gnt-node list-drbd command > > * stable-2.8 > Add reason parameter to RAPI client functions > > Conflicts: > qa/qa_rapi.py: import ALL the modules > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc qa/qa_rapi.py > index 73a97d3,cfbf3ff..67c103d > --- a/qa/qa_rapi.py > +++ b/qa/qa_rapi.py > @@@ -33,11 -33,11 +33,12 @@@ from ganeti import cl > from ganeti import compat > from ganeti import constants > from ganeti import errors > -from ganeti import pathutils > +from ganeti import locking > - from ganeti import pathutils > from ganeti import objects > + from ganeti import opcodes > -from ganeti import query > ++from ganeti import pathutils > from ganeti import qlang > +from ganeti import query > from ganeti import rapi > from ganeti import utils > > > > -- > 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
LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
