LGTM, thanks
On Wed, Jul 30, 2014 at 5:03 PM, 'Hrvoje Ribicic' via ganeti-devel < [email protected]> wrote: > commit 840afd0f130e04d35fd216cd39320484e034d274 > Merge: 649aba0 5438391 > Author: Hrvoje Ribicic <[email protected]> > Date: Wed Jul 30 14:56:57 2014 +0000 > > Merge branch 'stable-2.10' into stable-2.11 > > From stable-2.10: > Add non-cherry-pickable changes related to state "rb----" > Add Xen nothing state '------' > Add Xen paused state as a Ganeti running state > Update usage string for 'gnt-network connect' > > Conflicts: > lib/hypervisor/hv_xen.py - Taken the more complete 2.10 version > > Signed-off-by: Hrvoje Ribicic <[email protected]> > -- Helga Velroyen | Software Engineer | [email protected] | 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
