← Back to branch summary

~ubuntu-branches/debian/sid/opennebula/sid

« back to all changes in this revision

Viewing changes to src/vm/VirtualMachinePool.cc

  • Committer: Package Import Robot
  • Author(s): Damien Raude-Morvan
  • Date: 2012-05-11 19:27:43 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120511192743-lnz8gog5uxzmx2f3
Tags: 3.4.1-1
* New upstream release:
  - d/patches/default_conf.diff: Drop, transfert manager is now handled
    on a datasatore basis.
  - d/patches/genisoimage.diff: Merged upstream.
  - d/patches/oneacct-system-wide-installation.patch: Merged upstream.
  - Refresh others patches.
  - Update *.install files.
* Improve OCCI Self-Service UI integration:
  - Install into /usr/share/opennebula/occi/.
  - occi_system_jquery.diff: Use system wide jquery/jqueryui.
  - Add Recommends: libjs-jquery, libjs-jquery-ui for opennebula package.
* Add Suggests: ruby-uuidtools for econe-server.
* Install more manpages from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/vm/VirtualMachinePool.cc
27
27
VirtualMachinePool::VirtualMachinePool(SqlDB *                   db,
28
28
                                       vector<const Attribute *> hook_mads,
29
29
                                       const string& hook_location,
30
 
                                       const string& remotes_location)
31
 
    : PoolSQL(db,VirtualMachine::table)
 
30
                                       const string& remotes_location,
 
31
                                       vector<const Attribute *>& restricted_attrs)
 
32
    : PoolSQL(db, VirtualMachine::table, false)
32
33
{
33
34
    const VectorAttribute * vattr;
34
35
 
169
170
        {
170
171
            ostringstream oss;
171
172
 
172
 
            oss << "Unkown VM_HOOK " << on << ". Hook not registered!";
 
173
            oss << "Unknown VM_HOOK " << on << ". Hook not registered!";
173
174
            NebulaLog::log("VM",Log::WARNING,oss);
174
175
        }
175
176
    }
182
183
 
183
184
        add_hook(hook);
184
185
    }
 
186
 
 
187
    // Set restricted attributes
 
188
    VirtualMachineTemplate::set_restricted_attributes(restricted_attrs);
185
189
}
186
190
 
187
191
/* -------------------------------------------------------------------------- */
212
216
    {
213
217
        vm->state = VirtualMachine::PENDING;
214
218
    }
215
 
 
 
219
    
216
220
    // ------------------------------------------------------------------------
217
221
    // Insert the Object in the pool
218
222
    // ------------------------------------------------------------------------