« Previous | Next » 

Revision de2b0d1d

IDde2b0d1d30ed00a6b21b97c1fc2c658193bbe14e
Parent 0376655e, 7afca87f
Child 1d66efbe

Added by Guido Trotter almost 13 years ago

Merge branch 'devel-2.4'

  • devel-2.4:
    LUInstanceCreate: use opcodes.RequireFileStorage
    Don't add ",boot=on" to disks on kvm >= 0.14
    KVM: fix per-instance stored UID value

Conflicts:
lib/cmdlib.py
- use RequireSharedFileStorage there

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted