Revision 16aa776f
ID | 16aa776f7e8402d01b688ea6f9b364577718608c |
Parent | 0fecbced, 8c8ead4f |
Child | 064ea088 |
Merge branch 'feature-407rm' of git.opennebula.org:one into feature-407rm
Conflicts:
src/rm/RequestManager.cc
src/rm/SConstruct
Files
- added
- modified
- copied
- renamed
- deleted