Revision e4f4896b
ID | e4f4896b5252c7faf4cf26674a59ea82ac2ee267 |
Merge branch 'devel-2.5'
- devel-2.5: (33 commits)
htools: remove dead code
hail: don't select the primary as new secondary
hail: add an extra safety check in relocate
Fix RAPI documentation for gnt-instance console
Add SPICE compression and streaming options
Add SPICE support to gnt-instance console
Make KVM use the QXL vga driver with SPICE
Use a loop to check SPICE parameters dependency
import: Fix a logic error due to missing "not"
import: Make sure the disk_dump path is in EXPORT_DIR
Switch other commonprefix to IsBelowDir
utils: Introduce IsBelowDir
Fixed a typo in gnt_cluster.py
Added password for SPICE sessions
Draft implementation of QMP connection
Pylint fixes for autogenerated files
Version bump for 2.5.0~beta3
Makefile: Use $(LN_S) instead of “ln -s”
Fixes to errors/warnings raised by pylint 0.24
PEP8 for QA
...
Conflicts:
Makefile.am
- preserve both changes
lib/rapi/rlib2.py
- keep master version
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
Files
- added
- modified
- copied
- renamed
- deleted