« Previous | Next » 

Revision d23fa453

IDd23fa453829dd1f83f85c0130d97189049307284
Parent 4b199756, 5c3b03ba
Child 2f431fea

Added by Ruben S. Montero over 9 years ago

Merge branch 'master' of git.opennebula.org:one

Conflicts:
src/vm/VirtualMachineTemplate.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted