Skip to content
  • Thomas Thrainer's avatar
    Merge branch 'stable-2.8' into stable-2.9 · 804d72eb
    Thomas Thrainer authored
    
    
    * stable-2.8
      Fix batch creation of instances
      Fix documentation of gnt-instance batch-create
      Support multi instance allocs without iallocator
      Support DSA SSH keys in bootstrap
      Include VCS version in `gnt-cluster version`
      Document 'viridian' hypervisor parameter
      Support 'viridian' parameter in Xen HVM
      Document --no-conflicts-check for gnt-network
      Version bump for 2.8.0 rc1
      Add Make to the list of dependencies
      Check for luxid permission during verify config
      Add monitoring-query-format.rst to $(docinput)
      Fix documentation building rules
      Check disk template in right dict when copying
      Check disk template in right dict when copying
      ganeti.backend_unittest: chmod restricted cmd dir
      Fix formatting of tuple in error message
      Mark the UUID design doc as implemented
      Clarify that cmdlib/ must be removed downgrading
      Fix formatting error in the UPGRADE document
      Make build_chroot compatible with Squeeze
      Update security doc and NEWS for luxid
      Add --cleanup to instance failover manpage
      Update NEWS with failover cleanup
      Add cleanup parameter to instance failover
      Fix 'prcre' typo in INSTALL
      Update NEWS file for 2.8 wrt vnet_hdr KVM hvparam
      Document the vnet_hdr HV parameter for KVM
      Format gnt-network info group output
      Add 2.7.2 NEWS entry
      Prepare NEWS for 2.8.0 beta2
      Fix the downgrade function of cfgupgrade
      Increase maximum HTTP message size
      Clarify hbal man page
      Properly add the UUID to all the disks
    
    Conflicts:
    	NEWS
    	configure.ac
    	doc/design-draft.rst
    	doc/index.rst
    	lib/cmdlib/instance.py
    	lib/cmdlib/instance_migration.py
    	lib/constants.py
    	lib/hypervisor/hv_xen.py
    	man/gnt-instance.rst
    	man/gnt-network.rst
    	test/hs/Test/Ganeti/OpCodes.hs
    	tools/cfgupgrade
    
    All trivially merged.
    
    Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
    Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
    804d72eb