LGTM, thanks
On Fri, Apr 25, 2014 at 4:57 PM, 'Klaus Aehlig <[email protected]>' via ganeti-devel <[email protected]> wrote: > > commit b950106d47f622c945cecad0f8b5291191dbcb61 > Merge: ae9408a 98370c7 > Author: Klaus Aehlig <[email protected]> > Date: Fri Apr 25 16:51:45 2014 +0200 > > Merge branch 'stable-2.10' into stable-2.11 > > * stable-2.10 > Fix failed DRBD disk creation cleanup > Fix lint errors introduced during cherry-pick > Hooking up verification for shared file storage > Fix --shared-file-storage-dir option of gnt-cluster modify > Clarify default setting of 'metavg' > Fix invocation of GetCommandOutput in QA > Clean up RunWithLocks > Add an exception-trapping thread class > Wait for delay to provide interruption information > Add an expected block option to RunWithLocks > Track if a QA test was blocked by locks > Add a RunWithLocks QA utility function > > * stable-2.9 > If Automake version > 1.11, force serial tests > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc lib/client/gnt_cluster.py > index 943405f,d6a4b69..c7d2194 > --- a/lib/client/gnt_cluster.py > +++ b/lib/client/gnt_cluster.py > @@@ -2182,16 -2133,15 +2184,16 @@@ commands = > "modify": ( > SetClusterParams, ARGS_NONE, > [FORCE_OPT, > - BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, HVLIST_OPT, > MASTER_NETDEV_OPT, > - MASTER_NETMASK_OPT, NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, > - MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, ADD_UIDS_OPT, > REMOVE_UIDS_OPT, > - DRBD_HELPER_OPT, DEFAULT_IALLOCATOR_OPT, > - RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, > PREALLOC_WIPE_DISKS_OPT, > - NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, > HV_STATE_OPT, > - DISK_STATE_OPT] + SUBMIT_OPTS + > + BACKEND_OPT, CP_SIZE_OPT, RQL_OPT, > + ENABLED_HV_OPT, HVLIST_OPT, MASTER_NETDEV_OPT, > + MASTER_NETMASK_OPT, NIC_PARAMS_OPT, VG_NAME_OPT, > MAINTAIN_NODE_HEALTH_OPT, > + UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT, > + DEFAULT_IALLOCATOR_OPT, DEFAULT_IALLOCATOR_PARAMS_OPT, > RESERVED_LVS_OPT, > + DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT, > + USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT, > DISK_STATE_OPT] + > + SUBMIT_OPTS + > [ENABLED_DISK_TEMPLATES_OPT, IPOLICY_STD_SPECS_OPT, > MODIFY_ETCHOSTS_OPT] + > - INSTANCE_POLICY_OPTS + [GLOBAL_FILEDIR_OPT], > + INSTANCE_POLICY_OPTS + [GLOBAL_FILEDIR_OPT, > GLOBAL_SHARED_FILEDIR_OPT], > "[opts...]", > "Alters the parameters of the cluster"), > "renew-crypto": ( > > > -- > 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 > -- -- Helga Velroyen | Software Engineer | [email protected] | 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
