mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
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