On Tue, Aug 20, 2013 at 3:19 PM, Thomas Thrainer <[email protected]>wrote:
> commit e3a1095acbbdb91c0ec96c8e88c7e0d15fef411e > Merge: 71a3ad0 dd84e71 > Author: Thomas Thrainer <[email protected]> > Date: Tue Aug 20 14:27:07 2013 +0200 > > Merge branch 'stable-2.9' into master > > * stable-2.9 > Allow instance mods if only osparams are given > Use node UUIDs for locking instead of node names > Allow instance mods if only osparams are given > Fix a node name vs. UUID bug in instance import > Typo in hroller man page > Use node UUID for locking in LUInstanceMove > Fix harep manpage title > Fix IPolicy violation check in LUGroupSetParams > Use FQDN to check master node status > Revert "Display node name instead of UUID in error message" > Display node name instead of UUID in error message > Use node name in error message > QA: make ipolicy test respect enabled disk templates > QA: adjust tests wrt to ipolicy disk templates > ClusterSetParams: move vg-name checks from to CheckPrereq > man gnt-cluster: mention ipolicy check > Update NEWS file regarding ipolicy checks > gnt-group add/modify: ipolicy vs disk templates > Move Ipolicy utility function to cmdlib/common.py > bootstrap: restrict ipolicy to enabled disk templates > gnt-cluster modify: ipolicy vs enabled disk templates > gnt-cluster modify: factor out ipolicy check > > Conflicts: > lib/cmdlib/group.py (due to moved function, changes already in > master) > > Signed-off-by: Thomas Thrainer <[email protected]> > > -- > This merge breaks some tests in master which will be fixed by an additional > commit shortly. > > LGTM for pushing together with the test fix. 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
