Merge branch 'devel-2.5'

* devel-2.5:
  KVM: support version reported by 1.0
  doc/admin: Clarify archived jobs

Conflicts:
	NEWS: trivial

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --cc Makefile.am
index 7650418,c24d682..d538a84
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -660,32 -634,11 +660,36 @@@ TEST_FILES = 
        test/data/proc_drbd83.txt \
        test/data/proc_drbd83_sync.txt \
        test/data/proc_drbd83_sync_krnl2.6.39.txt \
+       test/data/kvm_1.0_help.txt \
+       test/data/kvm_0.15.90_help.txt \
+       test/data/kvm_0.12.5_help.txt \
+       test/data/kvm_0.9.1_help.txt \
        test/data/sys_drbd_usermode_helper.txt \
 +      test/data/ovfdata/compr_disk.vmdk.gz \
 +      test/data/ovfdata/config.ini \
 +      test/data/ovfdata/corrupted_resources.ovf \
 +      test/data/ovfdata/empty.ini \
 +      test/data/ovfdata/empty.ovf \
 +      test/data/ovfdata/ganeti.mf \
 +      test/data/ovfdata/ganeti.ovf \
 +      test/data/ovfdata/gzip_disk.ovf \
 +      test/data/ovfdata/new_disk.vmdk \
 +      test/data/ovfdata/no_disk.ini \
 +      test/data/ovfdata/no_disk_in_ref.ovf \
 +      test/data/ovfdata/no_os.ini \
 +      test/data/ovfdata/no_ovf.ova \
 +      test/data/ovfdata/ova.ova \
 +      test/data/ovfdata/second_disk.vmdk \
 +      test/data/ovfdata/rawdisk.raw \
 +      test/data/ovfdata/unsafe_path.ini \
 +      test/data/ovfdata/virtualbox.ovf \
 +      test/data/ovfdata/wrong_extension.ovd \
 +      test/data/ovfdata/wrong_config.ini \
 +      test/data/ovfdata/wrong_manifest.mf \
 +      test/data/ovfdata/wrong_manifest.ovf \
 +      test/data/ovfdata/wrong_ova.ova \
 +      test/data/ovfdata/wrong_xml.ovf \
 +      test/data/ovfdata/other/rawdisk.raw \
        test/import-export_unittest-helper
  
  python_tests = \

diff --cc NEWS
index 70d3d67,aa8bf69..7ce44e0
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,15 -2,18 +2,27 @@@ New
  ====
  
  
 +Version 2.6.0 beta1
 +-------------------
 +
 +*(unreleased)*
 +
 +- Deprecated ``admin_up`` field. Instead, ``admin_state`` is introduced,
 +  with 3 possible values -- ``up``, ``down`` and ``offline``.
 +
 +
+ Version 2.5.0 rc5
+ -----------------
+ 
+ *(unreleased)*
+ 
+ Improvements and bugfixes
+ ~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ - Support for kvm version 1.0, that changed the version reporting format
+   (from 3 to 2 digits).
+ 
+ 
  Version 2.5.0 rc4
  -----------------
  

diff --cc doc/admin.rst
Simple merge

diff --cc lib/hypervisor/hv_kvm.py
index 664ec61,9b341b7..65a2790
--- 1/lib/hypervisor/hv_kvm.py
--- 2/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@@ -505,12 -470,8 +505,12 @@@ class KVMHypervisor(hv_base.BaseHypervi
    _MIGRATION_INFO_MAX_BAD_ANSWERS = 5
    _MIGRATION_INFO_RETRY_DELAY = 2
  
-   _VERSION_RE = re.compile(r"\b(\d+)\.(\d+)\.(\d+)\b")
+   _VERSION_RE = re.compile(r"\b(\d+)\.(\d+)(\.(\d+))?\b")
  
 +  _CPU_INFO_RE = re.compile(r"cpu\s+\#(\d+).*thread_id\s*=\s*(\d+)", re.I)
 +  _CPU_INFO_CMD = "info cpus"
 +  _CONT_CMD = "cont"
 +
    ANCILLARY_FILES = [
      _KVM_NETWORK_SCRIPT,
      ]

diff --cc test/ganeti.hypervisor.hv_kvm_unittest.py
Simple merge