Revision 73ebb9ff
ID | 73ebb9ff366620c2a89dfac88eaf9b398e0d7ce1 |
Merge branch 'devel-2.5'
- devel-2.5:
Allow per-hypervisor optional files
Add hypervisors ancillary files list
xen: abstract a few hardcoded strings as constants
Conflicts:
lib/cmdlib.py
- trivial
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Files
- added
- modified
- copied
- renamed
- deleted