« Previous | Next » 

Revision 744dd57c

ID744dd57ca6499b3f4513fd8e2f6e86ac09b64b27
Parent e2ea8de1, 2d453213
Child 566db1f2

Added by Guido Trotter over 9 years ago

Merge branch 'stable-2.5' into devel-2.5

  • stable-2.5:
    LUNodeAdd: Verify version in Prereq
    Fix LV status parsing to accept newer LVM
    Bump version for 2.5.0~rc6 release
    Revert "Stop acquiring BGL for LUXI queries"
    LUClusterVerifyConfig: Share BGL, acquire all locks in shared mode
    KVM: don't add -nographic using spice
    Stop acquiring BGL for LUXI queries
    Fix type error in LUInstanceChangeGroup

Conflicts:
lib/hypervisor/hv_kvm.py
- trivial, keep both changes

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted