« Previous | Next » 

Revision 491d02ca

ID491d02cab80b47b29889b27c287a4ebaccf87b7d
Parent c56dd17b, dde85e1e
Child 9b154e2b

Added by Iustin Pop about 8 years ago

Merge branch 'devel-2.7'

  • devel-2.7: (23 commits)
    Add export lists for files which didn't have them
    Fix Haskell compatibility tests with disabled file storage
    Fix QA with disabled file storage
    Fix convert-constants handling of booleans
    Fix handling of disabled (shared) file storage
    Fix low verbosity levels in htools
    Fix improperly formatted docstring
    Allow iallocator to work without LVM storage
    Allow rpc.MakeLegacyNodeInfo to parse non-LVM results
    Fix LUTestAllocator with instance alloc
    Fix confd issue regarding --no-lvm-storage
    Fix networks in _PrepareNicModifications()
    Fix sphinx label namespace
    Clarify use of move-instance with self-signed certificates
    Remove early returns in network LUs
    Fix HooksDict() in case of no tags
    Add networks to _AllIDs()
    Fix locking in LUNetworkConnect()
    Fix networks in LUInstanceSetParams()
    Fix another docstring typo
    ...

Conflicts:
src/Ganeti/Query/Node.hs (trivial; function rename in master
and 'vgs' change in devel-2.7)
also exported new entity from TestCommon.hs (used in master)

Signed-off-by: Iustin Pop <>
Reviewed-by: Helga Velroyen <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted