Ruben S. Montero 5b117c6d2d Merge branch 'master' into feature-1691 ...

Conflicts:
	include/DispatchManager.h
	include/LifeCycleManager.h
	include/RequestManagerVirtualMachine.h
	include/VirtualMachineManager.h
	include/VirtualMachineManagerDriver.h
	src/cli/onevm
	src/dm/DispatchManagerActions.cc
	src/lcm/LifeCycleManager.cc
	src/lcm/LifeCycleStates.cc
	src/mad/ruby/VirtualMachineDriver.rb
	src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
	src/oca/ruby/opennebula/virtual_machine.rb
	src/onedb/3.8.1_to_3.9.80.rb
	src/rm/RequestManager.cc
	src/rm/RequestManagerVirtualMachine.cc
	src/vmm/VirtualMachineManager.cc
	src/vmm/VirtualMachineManagerDriver.cc
	src/vmm_mad/dummy/one_vmm_dummy.rb

2013-03-06 15:59:58 +01:00

..

test

Update copyright notice

2013-01-24 16:18:30 +01:00

AclManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

AclRule.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ActionManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Attribute.h

Update copyright notice

2013-01-24 16:18:30 +01:00

AuthManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

AuthManagerDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00

AuthRequest.h

Feature #1697: Use add_create_auth for the merged template

2013-02-18 16:44:38 +01:00

Callbackable.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Cluster.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Clusterable.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ClusterPool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ClusterTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Datastore.h

Update copyright notice

2013-01-24 16:18:30 +01:00

DatastorePool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

DatastoreTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

DefaultQuotas.h

Update copyright notice

2013-01-24 16:18:30 +01:00

DispatchManager.h

Merge branch 'master' into feature-1691

2013-03-06 15:59:58 +01:00

Document.h

Update copyright notice

2013-01-24 16:18:30 +01:00

DocumentPool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

FixedLeases.h

feature #471: Add IPv6 addresses to network leases

2013-03-02 00:23:27 +01:00

Group.h

Update copyright notice

2013-01-24 16:18:30 +01:00

GroupPool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

History.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Hook.h

Update copyright notice

2013-01-24 16:18:30 +01:00

HookManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

HookManagerDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Host.h

feature #1722: Use the right units for host update. Fix enforce in onevm command

2013-02-24 00:57:55 +01:00

HostHook.h

Update copyright notice

2013-01-24 16:18:30 +01:00

HostPool.h

Feature #1739: Move the host last_poll_time filtering to the DB query

2013-02-14 14:51:16 +01:00

HostShare.h

feature #1772:Resize VM capacity (cpu, memory and vcpu) offline

2013-02-23 19:49:06 +01:00

HostTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Image.h

Feature #1068: The core supports RBD images

2013-02-12 18:42:17 +01:00

ImageManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ImageManagerDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ImagePool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ImageTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

InformationManager.h

Feature #1739: Change host monitoring timeout to 5 minutes

2013-02-14 15:26:30 +01:00

InformationManagerDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Leases.h

feature #471: Add IPv6 addresses to network leases

2013-03-02 00:23:27 +01:00

LibVirtDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00

LifeCycleManager.h

Merge branch 'master' into feature-1691

2013-03-06 15:59:58 +01:00

Log.h

feature #1766: SysLog support selectable at build time

2013-02-11 19:06:20 +01:00

Mad.h

Update copyright notice

2013-01-24 16:18:30 +01:00

MadManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

mem_collector.h

Update copyright notice

2013-01-24 16:18:30 +01:00

MySqlDB.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Nebula.h

feature #1658: Moved init methods to constructors (static). Make use of log system enums for type cheking. Use the same LOG variables as oned for scheduler.

2013-02-01 18:49:03 +01:00

NebulaLog.h

feature #1766: SysLog support selectable at build time

2013-02-11 19:06:20 +01:00

NebulaTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

NebulaUtil.h

Merge branch 'feature-1739'

2013-02-17 00:07:07 +01:00

ObjectCollection.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ObjectSQL.h

Update copyright notice

2013-01-24 16:18:30 +01:00

ObjectXML.h

Feature #846: Add methods to update the VM template from the sched and log messages

2013-01-30 17:49:24 +01:00

OneClient.h

Update copyright notice

2013-01-24 16:18:30 +01:00

PoolObjectAuth.h

Update copyright notice

2013-01-24 16:18:30 +01:00

PoolObjectSQL.h

feature #1772:Resize VM capacity (cpu, memory and vcpu) offline

2013-02-23 19:49:06 +01:00

PoolSQL.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Quota.h

feature #1772:Resize VM capacity (cpu, memory and vcpu) offline

2013-02-23 19:49:06 +01:00

QuotaDatastore.h

Update copyright notice

2013-01-24 16:18:30 +01:00

QuotaImage.h

Update copyright notice

2013-01-24 16:18:30 +01:00

QuotaNetwork.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Quotas.h

feature #1772:Resize VM capacity (cpu, memory and vcpu) offline

2013-02-23 19:49:06 +01:00

QuotaVirtualMachine.h

feature #1772:Resize VM capacity (cpu, memory and vcpu) offline

2013-02-23 19:49:06 +01:00

RangedLeases.h

feature #471: Add IPv6 addresses to network leases

2013-03-02 00:23:27 +01:00

Request.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerAcl.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerAllocate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerChmod.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerChown.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerClone.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerCluster.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerDelete.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerGroup.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerHost.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerImage.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerInfo.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerPoolInfoFilter.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerRename.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerSystem.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerUpdateTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerUser.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerVirtualMachine.h

Merge branch 'master' into feature-1691

2013-03-06 15:59:58 +01:00

RequestManagerVirtualNetwork.h

Update copyright notice

2013-01-24 16:18:30 +01:00

RequestManagerVMTemplate.h

Feature #1697: Initial commit for user supplied Attributes on one.template.instantiate

2013-02-15 14:58:58 +01:00

SqlDB.h

Update copyright notice

2013-01-24 16:18:30 +01:00

SqliteDB.h

Update copyright notice

2013-01-24 16:18:30 +01:00

SyncRequest.h

Update copyright notice

2013-01-24 16:18:30 +01:00

SystemDB.h

Update copyright notice

2013-01-24 16:18:30 +01:00

Template.h

feature #1772:Resize VM capacity (cpu, memory and vcpu) offline

2013-02-23 19:49:06 +01:00

TransferManager.h

Update copyright notice

2013-01-24 16:18:30 +01:00

TransferManagerDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00

User.h

Update copyright notice

2013-01-24 16:18:30 +01:00

UserPool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

UserTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

VirtualMachine.h

Merge branch 'master' into feature-1691

2013-03-06 15:59:58 +01:00

VirtualMachineHook.h

Update copyright notice

2013-01-24 16:18:30 +01:00

VirtualMachineManager.h

Merge branch 'master' into feature-1691

2013-03-06 15:59:58 +01:00

VirtualMachineManagerDriver.h

Merge branch 'master' into feature-1691

2013-03-06 15:59:58 +01:00

VirtualMachinePool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

VirtualMachineTemplate.h

Feature #1483 #1556: VM attributes understood by opennebula are moved to TEMPLATE, the rest are left in USER_TEMPLATE

2013-02-06 15:23:55 +01:00

VirtualNetwork.h

feature #471: Cache binary representation of IP's. Reorder attributes to print leases.

2013-03-03 20:39:29 +01:00

VirtualNetworkPool.h

Merge branch 'master' into feature-1691

2013-03-06 15:59:58 +01:00

VirtualNetworkTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

VMTemplate.h

Update copyright notice

2013-01-24 16:18:30 +01:00

VMTemplatePool.h

Update copyright notice

2013-01-24 16:18:30 +01:00

XenDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00

XMLDriver.h

Update copyright notice

2013-01-24 16:18:30 +01:00