Skip to content
Snippets Groups Projects
Commit 73ebb9ff authored by Guido Trotter's avatar Guido Trotter
Browse files

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: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 487895ed 0ad1ea40
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment