-
Klaus Aehlig authored
* stable-2.10 Version bump for 2.10.0~rc1 Update NEWS for 2.10.0 rc1 release Fix pylint 0.26.0/Python 2.7 warning Update INSTALL and devnotes for 2.10 release * 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 devel/build_chroot lib/cmdlib/instance.py lib/hypervisor/hv_xen.py lib/jqueue.py src/Ganeti/Luxi.hs tools/cfgupgrade Resolution: - tools/cfgupgrade: ignore downgrade changes from 2.10 - NEWS: take both changes - devel/build_chroot: both changes differed only in indentation; use indentation from master - lib/hypervisor/hv_xen.py: manually apply fd201010 and 70d8491f to the conflicting hunks from stable-2.10 - lib/jqueue.py: manually apply 9cbcb1be to the conflicting hunk from master Semanitcal conflicts: - configure.ac: undo revision bump to ~rc1 - lib/query.py: manually merge the two independently added functions _GetInstAllNicVlans Signed-off-by: Klaus Aehlig <aehlig@google.com> Reviewed-by: Helga Velroyen <helgav@google.com>
f3ac6f36