Revision ddd667f7
| ID | ddd667f77ca86821154e72f29fee379ab56c3431 |
| Parent | 7231ca26, 12321d90 |
| Child | adf082f3 |
Merge branch 'stable-2.9' into stable-2.10
- stable-2.9
Make the LUInstanceCreate return node names, not UUIDs
Document new handling of degraded instances in NEWS
Gracefully handle degraded instances in verification
Be aware of the degraded case when cleaning up an instance
Document changes to file-based disks in NEWS
Preserve disk basename on instance rename
Update NEWS file
Modify test to reflect RAPI operation changes
Add QA tests for RAPI multi-instance allocation
Fix multi-allocation RAPI method
Assign unique filenames to filebased disks
- stable-2.8
Fix execution group of NodeD
Conflicts:
NEWS (took both changes)
lib/config.py (trivial)
test/py/ganeti.cmdlib_unittest.py
(manually reapplied changes to
test/py/cmdlib/instance_unittest.py)
Signed-off-by: Thomas Thrainer <thomasth@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>
Files
- added
- modified
- copied
- renamed
- deleted