[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.6.2-2-8-gc70de63

[Guido Trotter]

The following commit has been merged in the master branch:
commit b6388defcd65fad578d312805e85e911c7602721
Author: Guido Trotter <ultrotter at debian.org>
Date:   Fri Jun 28 16:18:41 2013 +0200

    Remove outdated fix-no-kvm.patch
    
    Signed-off-by: Guido Trotter <ultrotter at debian.org>

diff --git a/debian/patches/fix-no-kvm.patch b/debian/patches/fix-no-kvm.patch
deleted file mode 100644
index 1768e68..0000000
--- a/debian/patches/fix-no-kvm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Iustin Pop <iustin at debian.org>
-Description: Fix obsolete -disable-kvm usage
- This is already a bug upstream, but pending proper fixing (per version keying,
- etc.), let's just use the correct version that will be shipped in Wheezy.
-Bug: https://code.google.com/p/ganeti/issues/detail?id=250
-Last-Update: 2012-07-26
---- a/lib/hypervisor/hv_kvm.py
-+++ b/lib/hypervisor/hv_kvm.py
-@@ -554,7 +554,7 @@
-     if hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_ENABLED:
-       kvm_cmd.extend(["-enable-kvm"])
-     elif hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_DISABLED:
--      kvm_cmd.extend(["-disable-kvm"])
-+      kvm_cmd.extend(["-no-kvm"])
- 
-     if boot_network:
-       kvm_cmd.extend(["-boot", "n"])
diff --git a/debian/patches/series b/debian/patches/series
index 9e4356f..62f588b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
-fix-no-kvm.patch

-- 
Ganeti packaging