On Tue, Mar 12, 2013 at 12:20 PM, Bernardo Dal Seno <[email protected]> wrote: > commit f34e5bc2883b4e5ed0e625468faee516991b9939 > Merge: 2eef875 fa84c8a > Author: Bernardo Dal Seno <[email protected]> > Date: Tue Mar 12 12:07:11 2013 +0100 > > Merge branch 'devel-2.7' > > * devel-2.7 > Add QA for instance creation with policy violation > Add QA for policy-instance interactions > Add QA for cluster policies > Unit tests for objects.InstancePolicy + a fix > Unit tests for objects.FillIPolicy() + small fix > Fix upgrade of policy in objects.Cluster > Fix instance policy checks for default back-end parameters > Fix restoring default instance specs in group policies > Unit tests for cmdlib._GetUpdatedIPolicy() > Fix policy check for disk templates > Fix merge 8e09e801 that resulted in duplicated code > GanetiRapiClient: fix the no_remember option > > Conflicts: > qa/qa_cluster.py > qa/qa_instance.py > > Conflicts are due to QA config in master using objects instead of > dictionaries. Also updated some new QA code in devel for the same reason. >
LGTM Thanks, Guido
