Revision 727826b0
ID | 727826b0a89b53ca9bf0037ccc6c0205c87f9536 |
Parent | 24fe649e, 2a8ec0bb |
Child | b3316ed9 |
Merge branch 'feature-1223'
Conflicts:
src/image/ImageManagerActions.cc
src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
Files
- added
- modified
- copied
- renamed
- deleted