« Previous | Next » 

Revision 84b633b4

ID84b633b42b343253311c15ac7b7b3dcbacb6cb01
Parent e3c09095, 78e71d42
Child 2e3306a7

Added by Ruben S. Montero over 8 years ago

Merge branch 'feature-1224'

Conflicts:
include/RequestManagerVirtualMachine.h
src/cli/one_helper/onevm_helper.rb
src/oca/ruby/opennebula/virtual_machine.rb
src/rm/RequestManager.cc
src/rm/RequestManagerVirtualMachine.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted