• Klaus Aehlig's avatar
    Merge branch 'stable-2.8' into stable-2.9 · affe1792
    Klaus Aehlig authored
    * stable-2.8
      Version bump for 2.8.3
      Update NEWS for 2.8.3 release
      Support reseting arbitrary params of ext disks
      Allow modification of arbitrary params for ext
      Do not clear disk.params in UpgradeConfig()
      SetDiskID() before accepting an instance
      Lock group(s) when creating instances
      Fix job error message after unclean master shutdown
      Add default file_driver if missing
      Update tests
      Xen handle domain shutdown
      Fix evacuation out of drained node
      Refactor reading live data in htools
      master-up-setup: Ping multiple times with a shorter interval
      Add a packet number limit to "fping" in master-ip-setup
      Fix a bug in InstanceSetParams concerning names
      build_chroot: hard-code the version of blaze-builder
      Fix error printing
      Allow link local IPv6 gateways
      Fix NODE/NODE_RES locking in LUInstanceCreate
      eta-reduce isIpV6
      Ganeti.Rpc: use brackets for ipv6 addresses
      Update NEWS file with socket permission fix info
      Fix socket permissions after master-failover
    
    Conflicts:
    	NEWS
    	configure.ac
    	lib/cmdlib/instance.py
    	lib/cmdlib/instance_migration.py
    	lib/hypervisor/hv_xen.py
    	lib/masterd/iallocator.py
    	lib/objects.py
    	src/Ganeti/HTools/Backend/IAlloc.hs
    	src/Ganeti/HTools/Backend/Luxi.hs
    	src/Ganeti/HTools/Backend/Rapi.hs
    Resolution:
    	NEWS: take both additions
    	configure.ac: ignore revision bump on stable-2.8
    	Rest: manually apply the stable-2.8 changes on stable-2.9 code;
                  for lib/hypervisor/hv_xen.py this also includes passing
                  the additonal hvparams around, and adapting tests.
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
    affe1792
Rapi.hs 9.12 KB