projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc52d91e63e368f065b7181e9145554cdd8b9fbf1
treec6ae571ede2f7b9d42b358ae56f7fb637164adbctree | snapshot
parent899073756ed683d318b4234df36b6481d4770f2dcommit | diff
parent585c8187c08a31e40a741c6fddadb6a6191e5c99commit | diff
Merge branch 'stable-2.5' into devel-2.5

* 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>
Makefile.am diff1 | diff2 | blob | history
lib/hypervisor/hv_kvm.py diff1 | diff2 | blob | history
test/ganeti.hypervisor.hv_kvm_unittest.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.