On Mon, Feb 24, 2014 at 12:50 PM, Klaus Aehlig <[email protected]> wrote: > > commit 2dbaca4affaff71e487a136e1aeed0e20de1b208 > Merge: f2a3c4f 6386c54 > Author: Klaus Aehlig <[email protected]> > Date: Mon Feb 24 12:38:12 2014 +0100 > > Merge branch 'stable-2.9' into stable-2.10 > > * stable-2.9 > Fix net-common script in case of routed mode > Document hspace's SPN parameters > Document spindles in TSPEC > man: Update the manual page of gnt-node FAILOVER > Make hbal deal with no-LVM storage space properly > > * stable-2.8 > Improve job status assert affected by race condition > Export and import Disk/NIC name > Fix backup import in case NIC is inside a network > Override get() method of ConfigParser > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc lib/backend.py > index 639dd4f,685c09d..558610b > --- a/lib/backend.py > +++ b/lib/backend.py > @@@ -3160,9 -3076,11 +3162,11 @@@ def FinalizeExport(instance, snap_disks > config.set(constants.INISECT_INS, "disk%d_ivname" % disk_count, > ("%s" % disk.iv_name)) > config.set(constants.INISECT_INS, "disk%d_dump" % disk_count, > - ("%s" % disk.physical_id[1])) > + ("%s" % disk.logical_id[1])) > config.set(constants.INISECT_INS, "disk%d_size" % disk_count, > ("%d" % disk.size)) > + config.set(constants.INISECT_INS, "disk%d_name" % disk_count, > + "%s" % disk.name) > > config.set(constants.INISECT_INS, "disk_count", "%d" % disk_total) > > > > -- > 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
LGTM, 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
