On Thu, Oct 31, 2013 at 11:11 AM, Klaus Aehlig <[email protected]> wrote: > > Sorry, I forgot to add the conflict resolution > for test/py/cmdlib/instance_unittest.py to the commit. > The merge I really wanted to propose is the following. > > > > commit 8d3d73e5b37100ac13160d54614040ee8d94dd0f > Merge: a8b1e9f cabc869 > Author: Klaus Aehlig <[email protected]> > Date: Wed Oct 30 17:21:29 2013 +0100 > > Merge branch 'stable-2.10' into master > > * stable-2.10 > Remove FIXME + update man pages wrt iallocator > Don't check for master netdev when using OVS > Fix TypeError in backend/ConfigureOVS > Create Open vSwitch on Master during Cluster init > SimpleRetry on BlockDev.Remove() > Show the key in "'None' is not a valid Maybe value" > Fix usage of xm/xl for gnt-instance modify --new-primary > Hs2Py constants (17 patches) > Fix default value for reason trail > Hotplug (23 patches) > > * stable-2.8 > Add all dependencies for confd as test dependencies > Add snap-server to the test-relevevant packages
s/relevevant/relevant/, then LGTM again. 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
