Revision c503cea9
| ID | c503cea9a6a92ce429ecb3d9caae10493122881a |
| Parent | 1e638efc, 7a9d749f |
| Child | 29366ca7 |
Merge branch 'master' into feature-1291. It also implements a new state machine for images to fix #1297
Conflicts:
include/Template.h
src/image/Image.cc
src/image/ImageManagerActions.cc
src/image/ImageManagerDriver.cc
src/rm/RequestManagerAllocate.cc
Files
- added
- modified
- copied
- renamed
- deleted