LGTM, thanks
On Wed, Jun 18, 2014 at 10:43 AM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > commit db05d8eab22898781006ac2ed1b0ae27e17c48dc > Merge: e70af20 77feb12 > Author: Klaus Aehlig <[email protected]> > Date: Wed Jun 18 10:20:09 2014 +0200 > > Merge branch 'stable-2.11' into stable-2.12 > > * stable-2.11 > Remove old-style gnt-network connect > fix lint errors > Mention the correction option for using the full version > > * stable-2.10 > Export VLAN nicparam to NIC configuration scripts > Fix gnt-network client to accept vlan info > Fix query mechanism wrt networks and vlans > Fix LUNetwork* hooks to comply with docs > Fix LUNetworkConnect wrt vlan > > Conflicts: > lib/client/gnt_network.py > lib/hypervisor/hv_kvm/__init__.py > Resolution: > lib/client/gnt_network.py: use stable-2.11 version > lib/hypervisor/hv_kvm/__init__.py: use stable-2.12 version > > > -- > 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 >
