Revision 246fa7d4
| ID | 246fa7d4e51c036c2f4c9a80660429587c4f4e71 |
| Parent | 5f2d6a8f, c1cbe302 |
| Child | b601461d |
Merge branch 'stable-2.11' into master
- stable-2.11
(no changes)
- stable-2.10
KVM: use running HVPs to calc blockdev options
KVM: reserve a PCI slot for the SCSI controller
Check for LVM-based verification results only when enabled
Fix "existing" typos
Fix output of gnt-instance info after migration
Verify configuration version number before parsing
Conflicts:
lib/config.py: manually apply 2dc0acb98
to the version on master
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>
Files
- added
- modified
- copied
- renamed
- deleted