mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-22 18:50:08 +03:00
feature #3654: Add missing change after merges
This commit is contained in:
parent
df40f760a8
commit
22dcd3edeb
@ -188,10 +188,12 @@ void LifeCycleManager::stop_action(int vid)
|
||||
}
|
||||
else if (vm->get_state() == VirtualMachine::SUSPENDED)
|
||||
{
|
||||
Nebula& nd = Nebula::instance();
|
||||
TransferManager * tm = nd.get_tm();
|
||||
|
||||
//----------------------------------------------------
|
||||
// Bypass SAVE_STOP
|
||||
//----------------------------------------------------
|
||||
|
||||
vm->set_state(VirtualMachine::ACTIVE);
|
||||
vm->set_state(VirtualMachine::EPILOG_STOP);
|
||||
|
||||
@ -526,6 +528,9 @@ void LifeCycleManager::undeploy_action(int vid, bool hard)
|
||||
}
|
||||
else if (vm->get_state() == VirtualMachine::POWEROFF)
|
||||
{
|
||||
Nebula& nd = Nebula::instance();
|
||||
TransferManager * tm = nd.get_tm();
|
||||
|
||||
//----------------------------------------------------
|
||||
// Bypass SHUTDOWN_UNDEPLOY
|
||||
//----------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user