commit 945f157c49b309331766ec1e6262d3703657596a
Merge: 8f62463 b8be157
Author: Klaus Aehlig <[email protected]>
Date: Thu Oct 22 09:13:23 2015 +0200
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
Fix default for --default-iallocator-params
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc lib/client/gnt_cluster.py
index 8bd4b1e,0ee757f..0efe1d5
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@@ -1251,9 -1120,8 +1251,9 @@@ def SetClusterParams(opts, args)
opts.add_uids is not None or
opts.remove_uids is not None or
opts.default_iallocator is not None or
- opts.default_iallocator_params or
+ opts.default_iallocator_params is not None or
opts.reserved_lvs is not None or
+ opts.mac_prefix is not None or
opts.master_netdev is not None or
opts.master_netmask is not None or
opts.use_external_mip_script is not None or
--
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
