Revision df5758b1
| ID | df5758b1f2312bcb9024f1a2cb3be835c973f8ee |
Merge branch 'devel-2.2'
- devel-2.2:
gnt-job info: Sort input fields
KVM: Add function to check the hypervisor version
Bump version to 2.2.0, update NEWS
Fix instance rename regression from 3fe11ba3
Fix instance rename regression from 3fe11ba3
Update RAPI documentation for /2/nodes/[node_name]/migrate
Sort OS names and variants in LUDiagnoseOS
Add some trivial QA tests for the new OS states
Change behaviour of OpDiagnoseOS w.r.t. 'valid'
Allow gnt-os modify to change the new OS params
Add two more _T-type tests
Add blacklisted/hidden OS support in LUDiagnoseOS
Restrict blacklisted OSes in instance installation
Add two new cluster settings
Abstract OS name/variant functions
Add OS new states to the design doc
Remove the RPC changes from the 2.2 design
Remove 'Detailed Design' from design-2.2.rst
Conflicts:
lib/cli.py
lib/cmdlib.py
lib/objects.py
scripts/gnt-os
All conflicts were trivial.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Files
- added
- modified
- copied
- renamed
- deleted