shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

Merge branch 'master' of git.opennebula.org:one

Browse Source
This commit is contained in:
Ruben S. Montero 2012-06-21 16:53:07 +02:00
commit a857c5dadf
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/QuotaVirtualMachine.h
View File

@ -83,16 +83,10 @@ public:
VectorAttribute **va,
map<string, Attribute *>::iterator& it)
{
it = attributes.end();
it = attributes.begin();
return get_quota(id, va);
}
/**
* Overrides base to not delete anything
* @param it The quota iterator, ignored
*/
void del(map<string, Attribute *>::iterator& it){}
protected:
static const char * VM_METRICS[];

11
src/image/ImageManagerActions.cc
View File

@ -92,7 +92,16 @@ int ImageManager::acquire_image(Image *img, string& error)
{
case Image::READY:
img->inc_running();
img->set_state(Image::USED);
if ( img->isPersistent() )
{
img->set_state(Image::USED_PERS);
}
else
{
img->set_state(Image::USED);
}
ipool->update(img);
break;