projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0376655 7afca87)
Merge branch 'devel-2.4'
authorGuido Trotter <ultrotter@google.com>
Thu, 23 Jun 2011 13:56:00 +0000 (14:56 +0100)
committerGuido Trotter <ultrotter@google.com>
Thu, 23 Jun 2011 14:47:31 +0000 (15:47 +0100)
commitde2b0d1d30ed00a6b21b97c1fc2c658193bbe14e
treec956b11f7526eecec4648600bcb860c896400424tree | snapshot
parent0376655e988d0fb6b8b02a49ed4d519f0124a2d7commit | diff
parent7afca87fd4afeed42748710620c2b4c16e90340dcommit | diff
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>
lib/cmdlib.py diff1 | diff2 | blob | history
lib/hypervisor/hv_kvm.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.