projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8990737 585c818)
Merge branch 'stable-2.5' into devel-2.5
authorGuido Trotter <ultrotter@google.com>
Fri, 6 Jan 2012 10:50:45 +0000 (10:50 +0000)
committerGuido Trotter <ultrotter@google.com>
Fri, 6 Jan 2012 11:24:19 +0000 (11:24 +0000)
* stable-2.5:
  KVM: support version reported by 1.0

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Andrea Spadaccini <spadaccio@google.com>

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
lib/hypervisor/hv_kvm.py patch | diff1 | diff2 | blob | history
test/ganeti.hypervisor.hv_kvm_unittest.py patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc lib/hypervisor/hv_kvm.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.