Merge branch 'stable-2.9' into stable-2.10
* stable-2.9 Revision bump for 2.9.3 Schedule 2.9.3 release Document fix of issue 691 in NEWS NEWS: fix typo in 2.8.4 release Fix 'hvparams' of '_InstanceStartupMemory' on hypervisors Add missing option to gnt-instance documentation Update NEWS file Fix disk_type error in hypervisor parameter documentation Update NEWS file: issue 687 and configure fix luxid: fix detection of master node in node query query: fix detection of master in _GetNodeRole() Break line longer than 80 chars in configure.ac Technical writing: improve documentation and glossary configure: allow detection of Sphinx 1.2+ Remove deprecated _ERROR_DATA_KEY in QMP Technical writing: improve main documentation page Update the NEWS file with the Issue 640 fix Ensure that all the hypervisors exist in the config file Fix testEncodeInstance test input * stable-2.8 Version bump for 2.8.4 and NEWS update Update NEWS file with news about job cancellation bugfix Fix QA flakiness Linting fix: remove unused import Add missing parameter entry to man file Add QA test for job cancellation Add correct locking of master node to gnt-debug delay Add job id type assert to jqueue.py Add job id transformation/check to Luxi Python client Start-master/stop-master always fail if confd is disabled Improve backwards compatibility of Issue 649 fix Add missing NEWS entries from stable-2.8 Change usb_devices separator to whitespace Add support for blktap2 file-driver Update opcodes test to include network tags Make network tags searchable Add network tag tests to QA Fix RAPI network tag handling Fix gnt-network list-tags Conflicts: NEWS configure.ac doc/index.rst lib/constants.py lib/hypervisor/hv_kvm.py src/Ganeti/OpParams.hs src/Ganeti/Query/Server.hs test/hs/Test/Ganeti/OpCodes.hs test/py/ganeti.hypervisor.hv_xen_unittest.py test/py/ganeti.rpc_unittest.py Resolution: NEWS: take both additions configure.ac: ignore revision bump doc/index.rst: take stable-2.9 changes lib/constants.py: ignore stable-2.9 changes, but redo 7bc2c097 in the new constants framework (rest trivial) Signed-off-by:Klaus Aehlig <aehlig@google.com> Reviewed-by:
Hrvoje Ribicic <riba@google.com>
No related branches found
No related tags found
Showing
- NEWS 39 additions, 0 deletionsNEWS
- configure.ac 2 additions, 1 deletionconfigure.ac
- daemons/daemon-util.in 8 additions, 2 deletionsdaemons/daemon-util.in
- doc/css/style.css 4 additions, 0 deletionsdoc/css/style.css
- doc/glossary.rst 38 additions, 43 deletionsdoc/glossary.rst
- doc/index.rst 34 additions, 53 deletionsdoc/index.rst
- lib/cli.py 17 additions, 0 deletionslib/cli.py
- lib/client/gnt_instance.py 1 addition, 0 deletionslib/client/gnt_instance.py
- lib/cmdlib/tags.py 15 additions, 6 deletionslib/cmdlib/tags.py
- lib/cmdlib/test.py 10 additions, 2 deletionslib/cmdlib/test.py
- lib/hypervisor/hv_base.py 2 additions, 2 deletionslib/hypervisor/hv_base.py
- lib/hypervisor/hv_kvm.py 2 additions, 4 deletionslib/hypervisor/hv_kvm.py
- lib/hypervisor/hv_xen.py 2 additions, 2 deletionslib/hypervisor/hv_xen.py
- lib/jqueue.py 3 additions, 1 deletionlib/jqueue.py
- lib/luxi.py 14 additions, 1 deletionlib/luxi.py
- lib/objects.py 6 additions, 2 deletionslib/objects.py
- lib/query.py 4 additions, 4 deletionslib/query.py
- lib/rapi/rlib2.py 32 additions, 2 deletionslib/rapi/rlib2.py
- man/ganeti-os-interface.rst 3 additions, 3 deletionsman/ganeti-os-interface.rst
- man/gnt-instance.rst 20 additions, 4 deletionsman/gnt-instance.rst
Loading
Please register or sign in to comment