« Previous | Next » 

Revision c486fb6c

IDc486fb6cc69da18fea383f2194dacb5ef6f8b94a
Parent e34f46e6, 89c63fbe
Child bd341bff

Added by Thomas Thrainer over 7 years ago

Merge branch 'stable-2.9' into stable-2.10

  • stable-2.9
    Bump revision for 2.9.2
    Update NEWS for 2.9.2 release
    Pass hvparams to GetInstanceInfo
    Adapt parameters that moved to instance variables
    Avoid lines longer than 80 chars
    SingleNotifyPipeCondition: don't share pollers
    KVM: use custom KVM path if set for version checking
  • 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
devel/build_chroot
lib/constants.py
src/Ganeti/Rpc.hs

Resolution:
NEWS: take both additions
configure.ac: ignore version bump
constants.py: move constants to Constants.hs
instance_migration.py: Remove call to SetDiskID(...), it has been removed in 2.10
instance_unittest.py: Adapt test to new logic in LU
Rest: trivial

Signed-off-by: Thomas Thrainer <>
Reviewed-by: Michele Tartara <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted