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 <ultrotter@google.com> Reviewed-by:
Michael Hanselmann <hansmi@google.com>
Loading
Please register or sign in to comment