« Previous | Next » 

Revision bdba7a3d

IDbdba7a3d3c8cf542e03ad96c6d3cb4d7a4f3d0e8
Parent 1dbeaa17, 0f59a29e
Child 6e44c6eb

Added by Ruben S. Montero about 9 years ago

Merge branch 'feature-1223' of git.opennebula.org:one into feature-1223

Conflicts:
include/DispatchManager.h
include/VirtualMachine.h
src/rm/RequestManagerVirtualMachine.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted