shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

Fix wrong conflict resolution

Browse Source
This commit is contained in:
Ruben S. Montero 2012-06-20 00:06:38 +02:00
parent 727826b0a8
commit b3316ed944
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rm/RequestManagerImage.cc
View File

@ -262,7 +262,7 @@ void ImageClone::request_execute(
// -------------------------- Check Quotas ----------------------------
if ( quota_authorization(&img_usage, Quotas::IMAGE, att) == false )
if ( quota_authorization(&img_usage, Quotas::DATASTORE, att) == false )
{
delete tmpl;
return;
@ -283,7 +283,7 @@ void ImageClone::request_execute(
error_str);
if ( rc < 0 )
{
quota_rollback(&img_usage, Quotas::IMAGE, att);
quota_rollback(&img_usage, Quotas::DATASTORE, att);
failure_response(INTERNAL, allocate_error(error_str), att);
return;