mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-14 16:53:12 +09:00
Merge monitor information for the VM (instead of recreating). Update
Template.merge interface
This commit is contained in:
1 parent
2560c2da92
commit
03b7b77ce8
7 files changed
+17
-28
No files matched your search
@@ -200,8 +200,7 @@ int PoolObjectSQL::replace_template(
|
||||
{
|
||||
obj_template->remove_all_except_restricted();
|
||||
|
||||
string aux_error;
|
||||
new_tmpl->merge(obj_template, aux_error);
|
||||
new_tmpl->merge(obj_template);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -260,7 +259,8 @@ int PoolObjectSQL::append_template(
|
||||
{
|
||||
old_tmpl = new Template(*obj_template);
|
||||
|
||||
obj_template->merge(new_tmpl, error);
|
||||
obj_template->merge(new_tmpl);
|
||||
|
||||
delete new_tmpl;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user