-
Petr Pudlak authored
* stable-2.11 Postpone release of 2.11.4 by one day Remove known issues section for 2.11.4 Add known issue to 2.11.4 NEWS file Bump version to 2.11.4 Prepare NEWS file for 2.11.4 * stable-2.10 Add non-cherry-pickable changes related to state "rb----" Add Xen nothing state '------' Add Xen paused state as a Ganeti running state Update usage string for 'gnt-network connect' Conflicts: NEWS configure.ac lib/hypervisor/hv_xen.py Resolution: NEWS - include additions from 2.11 configure.ac - keep the 2.12 version lib/hypervisor/hv_xen.py - keep enhanced comments from 2.11 Signed-off-by: Petr Pudlak <pudlak@google.com> Reviewed-by: Helga Velroyen <helgav@google.com>
2dd7e038