Revision 5b117c6d
| ID | 5b117c6d2d1bfe7b96dbedd2c99ffa9769d9e8bf |
| Parent | 3bb55fc3, c560d389 |
| Child | 0bf9a505 |
Merge branch 'master' into feature-1691
Conflicts:
include/DispatchManager.h
include/LifeCycleManager.h
include/RequestManagerVirtualMachine.h
include/VirtualMachineManager.h
include/VirtualMachineManagerDriver.h
src/cli/onevm
src/dm/DispatchManagerActions.cc
src/lcm/LifeCycleManager.cc
src/lcm/LifeCycleStates.cc
src/mad/ruby/VirtualMachineDriver.rb
src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
src/oca/ruby/opennebula/virtual_machine.rb
src/onedb/3.8.1_to_3.9.80.rb
src/rm/RequestManager.cc
src/rm/RequestManagerVirtualMachine.cc
src/vmm/VirtualMachineManager.cc
src/vmm/VirtualMachineManagerDriver.cc
src/vmm_mad/dummy/one_vmm_dummy.rb
Files
- added
- modified
- copied
- renamed
- deleted