Revision fe66bb7d
ID | fe66bb7dafd6c34966f6698a4c80c0cf90be5aff |
Merge remote branch 'origin/stable-2.4' into grnet-2.4
Conflicts:
lib/hypervisor/hv_kvm.py
lib/opcodes.py
- Merge
Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
Files
- added
- modified
- copied
- renamed
- deleted