Revision 410945f1
ID | 410945f11aee035aabc8cc4389f72098341e075c |
Parent | 16b85a3c, 8dba1797 |
Child | e10c4a69 |
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
7bc2c09762 in the new constants framework
(rest trivial)
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>
Files
- added
- modified
- copied
- renamed
- deleted