Revision f7a4021c
| ID | f7a4021c1098e4913e416eea14e98717ce2cde18 |
Merge branch 'master' into xen
Conflicts:
snf-image-helper/common.sh
snf-image-host/Makefile.am
snf-image-host/common.sh.in
snf-image-host/create
snf-image-host/defaults
Files
- added
- modified
- copied
- renamed
- deleted