Skip to content
Snippets Groups Projects
Commit de2b0d1d authored by Guido Trotter's avatar Guido Trotter
Browse files

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: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 0376655e 7afca87f
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment