LGTM, thanks On Wed, Oct 8, 2014 at 4:28 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit 36f4f0165a8f3ec0441bca45ab0d109e05d917df > Merge: 4f92cb2 152ef64 > Author: Klaus Aehlig <[email protected]> > Date: Wed Oct 8 16:26:24 2014 +0200 > > Merge branch 'stable-2.12' into master > > * stable-2.12 > Also downgrade "disk_aio" and "virtio_net_queues" > Also downgrade kvm hypervisor parameters > > Conflicts: > tools/cfgupgrade: take master 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 >
