• Iustin Pop's avatar
    Merge branch 'devel-2.4' · e18c6c47
    Iustin Pop authored
    
    
    * devel-2.4:
      Another fix for LUClusterVerifyDisks
      QA: also run gnt-cluster verify-disks
      Fix disk adoption breakage
      Fix typo in query2 design document
      Improve documentation for QRFS_UNAVAIL
      lvmstrap: add PV-on-partition support
      lvmstrap: abstract a little the sysfs paths
      lvmstrap: ignore small-sized partitions
      lvmstrap: add explicit test for swap backends
      lvmstrap: add an explicit test for mounted devices
      lvmstrap: add more excluded FS types
      lvmstrap: fix very old contact information
      Instance query: replace duplicates with aliases
      query: Add alias support in _PrepareFieldList
      Fix disk count check in LUSetInstanceParams
      Document iallocator change (alloc_policy)
    
    Conflicts:
            lib/constants.py (due to QRFS→RS on master and doc on 2.4)
    Signed-off-by: default avatarIustin Pop <iustin@google.com>
    Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
    e18c6c47
ganeti.query_unittest.py 33.6 KB