LGTM
On Tue, Aug 19, 2014 at 5:27 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > commit ca00b833c1b156c2c1c0229d3a361d20be83b98d > Merge: 7bcc5fc 733880a > Author: Klaus Aehlig <[email protected]> > Date: Tue Aug 19 17:19:32 2014 +0200 > > Merge branch 'stable-2.10' into stable-2.11 > > * stable-2.10 > Fix network info in case of multi NIC instances > > Conflicts: > lib/cmdlib/network.py: use stable-2.11 version > > Signed-off-by: Klaus Aehlig <[email protected]> > > > -- > 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 >
