« Previous | Next » 

Revision 72e68b07

ID72e68b0703f26024ddefaef1c9748048e27f3d27
Parent bbe5ec52, bf2a63da
Child 072716ef

Added by Ruben S. Montero about 8 years ago

Merge branch 'feature-1835' into one-4.0

Conflicts:
src/lcm/LifeCycleStates.cc
src/vmm/VirtualMachineManager.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted