Ruben S. Montero 2e06f4f26d Merge branch 'feature-189' ...

Conflicts:
	include/VirtualMachine.h
	include/VirtualMachinePool.h
	include/VirtualNetwork.h
	share/etc/oned.conf
	src/scheduler/src/xml/expr_arith.cc
	src/scheduler/src/xml/expr_arith.h
	src/scheduler/src/xml/expr_bool.cc
	src/scheduler/src/xml/expr_bool.h
	src/scheduler/src/xml/expr_parser.c
	src/template/template_parser.c
	src/template/template_syntax.cc
	src/template/template_syntax.h
	src/vm/VirtualMachine.cc
	src/vm/VirtualMachinePool.cc
	src/vm/vm_var_parser.c
	src/vm/vm_var_syntax.cc
	src/vm/vm_var_syntax.h

2010-06-25 14:34:44 +02:00

..

test

Removed unneeded locks and updated Pool tests

2010-06-03 11:47:03 +02:00

ActionManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

Attribute.h

feature #212: Put attribute data within CDDATA

2010-05-18 23:43:50 +02:00

Callbackable.h

bug #259: Callback functions are locked until the DB query answer is processed.

2010-06-11 19:11:12 +02:00

DispatchManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

FixedLeases.h

feature #206: Moved the Virtual Network to new DB classes

2010-04-10 22:15:47 +02:00

History.h

feature #206: Isolation of INSERT and REPLACE SQL queries for History objects

2010-05-03 19:13:37 +02:00

Hook.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

HookManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

HookManagerDriver.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

Host.h

feature #212: get rid of rank & req methods for Host class

2010-05-14 03:36:04 +02:00

HostPool.h

bug : Rollback Host objects while inserting in DB, better comments for HostPool.h and return oid in method allocate

2010-04-28 18:25:43 +02:00

HostShare.h

feature #206: Isolation of INSERT and REPLACE SQL queries for Host objects.

2010-04-28 15:00:07 +02:00

HostTemplate.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

InformationManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

InformationManagerDriver.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

Leases.h

feature #206: Moved the Virtual Network to new DB classes

2010-04-10 22:15:47 +02:00

LibVirtDriver.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

LifeCycleManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

Log.h

feature #192: Decouple Logger from Nebula class

2010-04-21 00:40:16 +02:00

Mad.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

MadManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

MySqlDB.h

feature #206: OpenNebula can now be compiled with several DB backends

2010-05-07 14:45:27 +02:00

Nebula.h

feature #192: Decouple Logger from Nebula class

2010-04-21 00:40:16 +02:00

NebulaLog.h

feature #192: free log resources in NebulaLog and base PoolTest class

2010-04-22 23:27:39 +02:00

NebulaTemplate.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

ObjectSQL.h

feature #206: New interace for callbacks

2010-04-03 16:54:09 +02:00

OneClient.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

PoolObjectSQL.h

feature #206: Moved Pool classes to the new DB interface

2010-04-03 16:54:54 +02:00

PoolSQL.h

Removed unneeded locks and updated Pool tests

2010-06-03 11:47:03 +02:00

RangedLeases.h

feature #206: Moved the Virtual Network to new DB classes

2010-04-10 22:15:47 +02:00

RequestManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

SqlDB.h

feature #206: New interace for callbacks

2010-04-03 16:54:09 +02:00

SqliteDB.h

feature #206: OpenNebula can now be compiled with several DB backends

2010-05-07 14:45:27 +02:00

Template.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

TemplateSQL.h

feature #206: Isolation of INSERT and REPLACE SQL queries for Host objects.

2010-04-28 15:00:07 +02:00

TransferManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

TransferManagerDriver.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

User.h

feature #206: Isolation of INSERT and REPLACE SQL queries for User objects.

2010-04-26 18:29:31 +02:00

UserPool.h

bug: better comments for the UserPool and erro returning oid in allocate

2010-04-28 18:37:45 +02:00

VirtualMachine.h

Merge branch 'feature-189'

2010-06-25 14:34:44 +02:00

VirtualMachineHook.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

VirtualMachineManager.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

VirtualMachineManagerDriver.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

VirtualMachinePool.h

Merge branch 'feature-189'

2010-06-25 14:34:44 +02:00

VirtualMachineTemplate.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

VirtualNetwork.h

Merge branch 'feature-189'

2010-06-25 14:34:44 +02:00

VirtualNetworkPool.h

feature #192: More tests for Vnet allocation. It also solves some bugs.

2010-05-03 15:57:52 +02:00

VirtualNetworkTemplate.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

XenDriver.h

Changed copyright notice

2010-02-22 18:00:30 +01:00

XMLDriver.h

Changed copyright notice

2010-02-22 18:00:30 +01:00